diff --git a/lua/completion.lua b/lua/completion.lua
index 308001d..a20eec8 100644
--- a/lua/completion.lua
+++ b/lua/completion.lua
@@ -15,8 +15,21 @@ cmp.setup({
 			return vim_item
 		end,
 	},
+	-- completion = {
+	-- 	completeopt = 'menu,menuone,noinsert',
+	-- },
+	completion = {
+		completeopt = 'menu,menuone,noinsert',
+	},
+	performance = {
+		max_view_entries = 10,
+	},
 	window = {
-		completion = cmp.config.window.bordered(),
+		completion = cmp.config.window.bordered({
+			-- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
+			col_offset = -3,
+			side_padding = 0,
+		}),
 		documentation = cmp.config.window.bordered(),
 	},
 	mapping = cmp.mapping.preset.insert({
@@ -88,50 +101,51 @@ cmp.setup.cmdline(":", {
 	}),
 })
 
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
-require("lspconfig").clangd.setup({
-	capabilities = capabilities,
-})
-require("lspconfig").taplo.setup({
-	capabilities = capabilities,
-})
-require("lspconfig").marksman.setup({
-	capabilities = capabilities,
-})
-require("lspconfig").lua_ls.setup({
-	capabilities = capabilities,
-})
-require("lspconfig").rust_analyzer.setup({
-	capabilities = capabilities,
-})
-require("lspconfig").zls.setup({
-	capabilities = capabilities,
-})
-require("lspconfig").gopls.setup({
-	capabilities = capabilities,
-	settings = {
-		gopls = {
-			analyses = {
-				unusedparams = true,
-				unusedwrite = true,
-				shadow = true,
-			},
-			staticcheck = true,
-			usePlaceholders = true,
-			hints = {
-				assignVariableTypes = true,
-				compositeLiteralFields = true,
-				compositeLiteralTypes = true,
-				functionTypeParameters = true,
-				parameterNames = true,
-				rangeVariableTypes = true,
-			},
-		},
-	},
-})
-require("lspconfig").pyright.setup({
-	capabilities = capabilities,
-})
-require("lspconfig").nim_langserver.setup({
-	capabilities = capabilities,
-})
+-- LSP server configurations moved to lsp.lua to avoid duplicates
+-- local capabilities = require("cmp_nvim_lsp").default_capabilities()
+-- require("lspconfig").clangd.setup({
+-- 	capabilities = capabilities,
+-- })
+-- require("lspconfig").taplo.setup({
+-- 	capabilities = capabilities,
+-- })
+-- require("lspconfig").marksman.setup({
+-- 	capabilities = capabilities,
+-- })
+-- require("lspconfig").lua_ls.setup({
+-- 	capabilities = capabilities,
+-- })
+-- require("lspconfig").rust_analyzer.setup({
+-- 	capabilities = capabilities,
+-- })
+-- require("lspconfig").zls.setup({
+-- 	capabilities = capabilities,
+-- })
+-- require("lspconfig").gopls.setup({
+-- 	capabilities = capabilities,
+-- 	settings = {
+-- 		gopls = {
+-- 			analyses = {
+-- 				unusedparams = true,
+-- 				unusedwrite = true,
+-- 				shadow = true,
+-- 			},
+-- 			staticcheck = true,
+-- 			usePlaceholders = true,
+-- 			hints = {
+-- 				assignVariableTypes = true,
+-- 				compositeLiteralFields = true,
+-- 				compositeLiteralTypes = true,
+-- 				functionTypeParameters = true,
+-- 				parameterNames = true,
+-- 				rangeVariableTypes = true,
+-- 			},
+-- 		},
+-- 	},
+-- })
+-- require("lspconfig").pyright.setup({
+-- 	capabilities = capabilities,
+-- })
+-- require("lspconfig").nim_langserver.setup({
+-- 	capabilities = capabilities,
+-- })
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 3a1dcb3..8bd8fd2 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -44,23 +44,32 @@ vim.lsp.enable('basedpyright', {
 require("lsp_signature").setup({
   debug = false,
   bind = true,
-  doc_lines = 10,
-  max_height = 12,
-  max_width = function() return math.floor(vim.api.nvim_win_get_width(0) * 0.8) end,
+  -- doc_lines = 10,
+  -- max_height = 12,
+  -- max_width = function() return math.floor(vim.api.nvim_win_get_width(0) * 0.8) end,
+  doc_lines = 5,
+  max_height = 8,
+  max_width = function() return math.floor(vim.api.nvim_win_get_width(0) * 0.7) end,
   wrap = true,
   floating_window = true,
-  floating_window_above_cur_line = true,
+  -- floating_window_above_cur_line = true,
+  -- floating_window_off_y = 0,
+  floating_window_above_cur_line = false,
   floating_window_off_x = 1,
-  floating_window_off_y = 0,
-  hint_enable = true,
+  floating_window_off_y = 1,
+  -- hint_enable = true,
+  hint_enable = false,
   hint_inline = function() return false end,
-  hint_prefix = "🐼 ",
+  -- hint_prefix = "🐼 ",
+  hint_prefix = "",
   hint_scheme = "String",
   hi_parameter = "LspSignatureActiveParameter",
   handler_opts = { border = "rounded" },
   always_trigger = false,
+  auto_close_after = 5,
   extra_trigger_chars = { "(", "," },
-  zindex = 200,
+  -- zindex = 200,
+  zindex = 50,
   padding = "",
   timer_interval = 200,
 })