diff --git a/vim/plug.vim b/vim/plug.vim
index cdff0ec..cd56632 100644
--- a/vim/plug.vim
+++ b/vim/plug.vim
@@ -21,9 +21,13 @@ Plug 'vim-scripts/apachelogs.vim', {'for': 'apachelogs'}
 Plug 'vim-scripts/syslog-syntax-file', {'for': 'messages'}
 Plug 'othree/html5.vim', {'for': ['html','php']}
 Plug 'vim-scripts/bbcode', {'for': 'bbcode'}
-Plug 'tpope/vim-markdown',{'for': 'markdown'}
+Plug 'godlygeek/tabular'
+Plug 'plasticboy/vim-markdown', {'for': ['markdown', 'mkd.markdown'] }
+
+
 Plug 'vim-scripts/JSON.vim', {'for': 'json'}
 Plug 'PProvost/vim-ps1', {'for': 'ps1'}
+Plug 'kchmck/vim-coffee-script', {'for': ['coffee', 'markdown', 'mkd.markdown']}
 
 " Files
 Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle'  }
@@ -63,6 +67,6 @@ Plug 'junegunn/vim-github-dashboard', { 'on': ['GHDashboard', 'GHActivity'] }
 "Plugin 'lervag/vimtex'
 "Plugin 'reedes/vim-pencil'
 "Plugin 'terryma/vim-multiple-cursors'
-"Plugin 'mbbill/undotree'
+Plug 'mbbill/undotree'
 
 call plug#end()
diff --git a/vim/vimrc b/vim/vimrc
index f543a90..315c527 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -105,6 +105,10 @@ nnoremap <C-n> :call NumberToggle()<cr>
 
 command! -nargs=+ MapToggle call MapToggle(<f-args>)
 " Keys & functions
+inoremap <F2> <esc>:NERDTreeToggle<cr>
+nnoremap <F2> :NERDTreeToggle<cr>
+inoremap <F3> <esc>:TagbarToggle<cr>
+nnoremap <F3> :TagbarToggle<cr>
 MapToggle <F4> number
 MapToggle <F5> spell
 MapToggle <F6> paste
@@ -143,7 +147,7 @@ let maplocalleader = "\\"
 
 noremap <leader>y "+y
 noremap <leader>Y "+Y
-noremap <leader>p "+
+noremap <leader>p "+p
 
 " Underline (Markdown Style)
 nnoremap <leader>= YpVr=
@@ -201,5 +205,9 @@ let g:VimuxOrientation = "h"
 " Prompt for a command to run
 noremap <leader>vp :VimuxPromptCommand<CR>
 
+" markdown
+let g:vim_markdown_frontmatter=1
+let g:vim_markdown_folding_disabled=1
+
 " CtrlP
 nmap <C-b> :CtrlPBuffer<cr>