diff --git a/init.lua b/init.lua
index 26a4855..ae61351 100644
--- a/init.lua
+++ b/init.lua
@@ -207,7 +207,18 @@ vim.api.nvim_create_autocmd('TextYankPost', {
 require("nvim-tree").setup()
 
 -- bufferline setup
-require("bufferline").setup{}
+require("bufferline").setup{
+    options = {
+        offsets = {
+          {
+                filetype = "NvimTree",
+                text = "File Explorer",
+                highlight = "Directory",
+                separator = true -- use a "true" to enable the default, or set your own character
+          }
+        },
+    }
+}
 
 -- Set lualine as statusline
 -- See `:help lualine.txt`
@@ -275,7 +286,11 @@ vim.keymap.set('n', '<leader>e', '<esc>:NvimTreeToggle<cr>', {desc = 'Open file
 vim.keymap.set('n', '<S-l>', '<esc>:BufferLineCycleNext<cr>', {desc = 'Next buffer', silent = true})
 vim.keymap.set('n', '<S-h>', '<esc>:BufferLineCyclePrev<cr>', {desc = 'Previous buffer', silent = true})
 
--- toggleterm
+-- quicker window navigation
+vim.keymap.set('n', '<C-h>', '<C-w>h', {desc = 'window navigation', silent = true})
+vim.keymap.set('n', '<C-j>', '<C-w>j', {desc = 'window navigation', silent = true})
+vim.keymap.set('n', '<C-k>', '<C-w>k', {desc = 'window navigation', silent = true})
+vim.keymap.set('n', '<C-l>', '<C-w>l', {desc = 'window navigation', silent = true})
 
 -- Enable telescope fzf native, if installed
 pcall(require('telescope').load_extension, 'fzf')
@@ -301,7 +316,7 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
 -- See `:help nvim-treesitter`
 require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'typescript', 'help', 'vim' },
+  ensure_installed = { 'c', 'cpp', 'rust', 'go', 'lua', 'python', 'rust', 'typescript', 'help', 'vim' },
 
   highlight = { enable = true },
   indent = { enable = true, disable = { 'python' } },
@@ -391,7 +406,7 @@ local on_attach = function(_, bufnr)
   nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
   nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
   nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
-  nmap('<leader>ld', vim.diagnostic.open_float, 'Diagnostics')
+  nmap('gl', vim.diagnostic.open_float, 'Current line diagnostics')
   nmap('<leader>ls', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
   nmap('<leader>lw', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
 
@@ -422,7 +437,7 @@ local servers = {
   clangd = {},
   gopls = {},
   -- pyright = {},
-  -- rust_analyzer = {},
+  rust_analyzer = {},
   -- tsserver = {},
 
   sumneko_lua = {
@@ -515,4 +530,4 @@ cmp.setup {
 }
 
 -- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et
\ No newline at end of file
+-- vim: ts=2 sts=2 sw=2 et