diff --git a/lua/autocmds.lua b/lua/autocmds.lua
index d0c2e37..1f6502d 100644
--- a/lua/autocmds.lua
+++ b/lua/autocmds.lua
@@ -10,12 +10,3 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
         vim.opt_local.wrap = true
     end,
 })
-
--- vim.api.nvim_create_autocmd({ "FileType" }, {
--- 	group = augroup("close_with_q"),
--- 	pattern = { "fugitive", "git", "gitcommit" },
--- 	callback = function(event)
--- 		vim.bo[event.buf].buflisted = false
--- 		vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
--- 	end,
--- })
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
index cd7c73b..ce45753 100644
--- a/lua/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -15,12 +15,19 @@ return {
             }
         },
     },
+    {
+        "famiu/bufdelete.nvim",
+        keys = {
+            { "<leader>bd", "<cmd>Bdelete<cr>", desc = "Close Buffer" },
+        },
+    },
     {
         "akinsho/bufferline.nvim",
         event = "VeryLazy",
         keys = {
-            { "[b", "<cmd>BufferLineCyclePrev<cr>", desc = "Prev Buffer" },
-            { "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" },
+            { "<leader>bp", "<cmd>BufferLineTogglePin<cr>", desc = "Toggle Pin" },
+            { "[b",         "<cmd>BufferLineCyclePrev<cr>", desc = "Prev Buffer" },
+            { "]b",         "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" },
         },
         opts = {
             options = {