diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 1f7d9b6..2860489 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -316,10 +316,9 @@ nnoremap Lt :call ToggleLocationList()<CR>
 " Key Bindings to help with terminal mode
 :tnoremap jk <C-\><C-n>
 " Key bindings to move between window splits
-nnoremap gh <C-w>h
-nnoremap gj <C-w>j
-nnoremap gk <C-w>k
-nnoremap gl <C-w>l
+for key in range(0, 9)
+  execute 'nnoremap <Space>'.key key.'<C-w>w'
+endfor
 
 " Disable Arrow Keys
 inoremap  <Up>     <NOP>
@@ -591,11 +590,12 @@ let g:airline#extensions#tabline#left_alt_sep = '|'
 let g:airline#extensions#tabline#right_sep = ' '
 let g:airline#extensions#tabline#right_alt_sep = '|'
 let g:airline#extensions#tabline#formatter = 'default'
+let g:airline#extensions#tabline#buffer_nr_show = 1
 let g:airline_left_sep = ' '
 let g:airline_left_alt_sep = '|'
 let g:airline_right_sep = ' '
 let g:airline_right_alt_sep = '|'
-let g:airline#extensions#tabline#buffer_nr_show = 1
+let g:airline_section_y = '%{winnr()}'
 
 " Let vim-gitgutter do its thing on large files
 let g:gitgutter_max_signs=1000