diff --git a/init.lua b/init.lua
index a594c0f7..5586a5a4 100644
--- a/init.lua
+++ b/init.lua
@@ -206,7 +206,7 @@ vim.g.theme = "tokyonight"
 -- NOTE: You can change these options as you wish!
 
 -- Set highlight on search
-vim.o.hlsearch = true
+vim.o.hlsearch = false
 
 -- Make line numbers default
 vim.wo.number = true
@@ -252,8 +252,11 @@ vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
+
 -- Remap for navigating between buffers
 vim.keymap.set('n', '<leader>x', '<cmd>bd<CR>', { silent = true })
+vim.keymap.set('n', '<leader>l', '<cmd>bnext<CR>', { silent = true })
+vim.keymap.set('n', '<leader>h', '<cmd>bprev<CR>', { silent = true })
 
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`
@@ -496,6 +499,7 @@ cmp.setup {
       behavior = cmp.ConfirmBehavior.Replace,
       select = true,
     },
+    ['<CR>'] = cmp.mapping.confirm({ select = false }),
     ['<Tab>'] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
diff --git a/lua/custom/statusline/init.lua b/lua/custom/statusline/init.lua
index fd334ce4..efdd7cbc 100644
--- a/lua/custom/statusline/init.lua
+++ b/lua/custom/statusline/init.lua
@@ -1,4 +1,5 @@
 vim.opt.statusline = "%!v:lua.require('custom.statusline.statusline').run()"
+vim.opt.laststatus = 3
 
 function SetColors(theme)
   for hlgroupName, hlgroup_vals in pairs(theme) do
diff --git a/lua/custom/statusline/statusline.lua b/lua/custom/statusline/statusline.lua
index 9bb1dd6c..6118c2b1 100644
--- a/lua/custom/statusline/statusline.lua
+++ b/lua/custom/statusline/statusline.lua
@@ -12,6 +12,7 @@ local separators = (type(sep_style) == "table" and sep_style) or default_sep_ico
 
 local sep_l = separators["left"]
 local sep_r = separators["right"]
+local sep_m = default_sep_icons["block"]["left"]
 
 local function stbufnr()
   return vim.api.nvim_win_get_buf(vim.g.statusline_winid)
@@ -173,8 +174,9 @@ M.LSP_status = function()
 end
 
 M.cwd = function()
-  local dir_icon = "%#St_cwd_icon#" .. "󰉋 "
-  local dir_name = "%#St_cwd_text#" .. " " .. fn.fnamemodify(fn.getcwd(), ":t") .. " "
+  -- local dir_icon = "%#St_cwd_icon#" .. "󰉋 "
+  local dir_icon = "%#St_cwd_sep#" .. sep_m
+  local dir_name = "%#St_file_info#" .. " " .. fn.fnamemodify(fn.getcwd(), ":t") .. " "
   return (vim.o.columns > 85 and ("%#St_cwd_sep#" .. sep_l .. dir_icon .. dir_name)) or ""
 end