diff --git a/vimrc b/vimrc
index e870364..1116642 100644
--- a/vimrc
+++ b/vimrc
@@ -42,12 +42,26 @@ set ttimeout
 set timeout timeoutlen=300
 let mapleader=','
 
-"mapping
-nmap <silent> <S-A-Up> :wincmd k<CR>
-nmap <silent> <^[[1;4D> : wincmd h<CR>
-nmap <silent> <S-A-Down> :wincmd j<CR>
-nmap <silent> <S-A-Left> :wincmd h<CR>
-nmap <silent> <S-A-Right> :wincmd l<CR>
+" window nav
+nnoremap <leader>w <C-w>
+nnoremap <Esc>h <C-w>h
+nnoremap <Esc>j <C-w>j
+nnoremap <Esc>k <C-w>k
+nnoremap <Esc>l <C-w>l
+
+" resize window
+nnoremap <C-h> <C-w><
+nnoremap <C-j> <C-w>+
+nnoremap <C-k> <C-w>-
+nnoremap <C-l> <C-w>>
+" tab nav
+nnoremap <Esc>n :tabn<cr>
+nnoremap <Esc>p :tabp<cr>
+" buffer nav
+nmap <C-n> :bn<cr>
+nmap <C-p> :bp<cr>
+
+nmap <silent> <^[[1;4D> :wincmd h<CR>
 nmap <silent> <C-l> :noh<CR>
 nmap <silent> <F6> gg=G<C-o><C-o><CR>
 nmap <silent> <C-t> :NERDTreeToggle<CR>