diff --git a/lua/custom/configs/settings.lua b/lua/custom/configs/settings.lua
index 8eb77107..fd0d34e9 100644
--- a/lua/custom/configs/settings.lua
+++ b/lua/custom/configs/settings.lua
@@ -36,7 +36,7 @@ o.swapfile = false
 
 -- Scrolling settings
 o.scrolloff = 8
-o.colorcolumn = '80'
+o.colorcolumn = '120'
 
 o.timeoutlen = 500
 
diff --git a/lua/custom/plugins/debug.lua b/lua/custom/plugins/debug.lua
index c9b9a6b1..1abd8f53 100644
--- a/lua/custom/plugins/debug.lua
+++ b/lua/custom/plugins/debug.lua
@@ -58,7 +58,7 @@ return {
         -- a string that defines the port to start delve debugger.
         -- default to string "${port}" which instructs nvim-dap
         -- to start the process in a random available port
-        port = "${port}",
+        port = "2345",
         -- additional args to pass to dlv
         args = {}
       },
@@ -66,26 +66,54 @@ return {
 
     -- Dap UI setup
     -- For more information, see |:help nvim-dap-ui|
-       dapui.setup()
-    -- dapui.setup {
-    --   -- Set icons to characters that are more likely to work in every terminal.
-    --   --    Feel free to remove or use ones that you like more! :)
-    --   --    Don't feel like these are good choices.
-    --   icons = { expanded = '▾', collapsed = '▸', current_frame = '*' },
-    --   controls = {
-    --     icons = {
-    --       pause = '⏸',
-    --       play = '▶',
-    --       step_into = '⏎',
-    --       step_over = '⏭',
-    --       step_out = '⏮',
-    --       step_back = 'b',
-    --       run_last = '▶▶',
-    --       terminate = '⏹',
-    --       disconnect = "⏏",
-    --     },
-    --   },
-    -- }
+    -- dapui.setup()
+    dapui.setup {
+      -- Set icons to characters that are more likely to work in every terminal.
+      --    Feel free to remove or use ones that you like more! :)
+      --    Don't feel like these are good choices.
+      icons = { expanded = '▾', collapsed = '▸', current_frame = '*' },
+      controls = {
+        icons = {
+          pause = '⏸',
+          play = '▶',
+          step_into = '⏎',
+          step_over = '⏭',
+          step_out = '⏮',
+          step_back = 'b',
+          run_last = '▶▶',
+          terminate = '⏹',
+          disconnect = "⏏",
+        },
+      },
+      -- Layouts define sections of the screen to place windows.
+      -- The position can be "left", "right", "top" or "bottom".
+      -- The size specifies the height/width depending on position. It can be an Int
+      -- or a Float. Integer specifies height/width directly (i.e. 20 lines/columns) while
+      -- Float value specifies percentage (i.e. 0.3 - 30% of available lines/columns)
+      -- Elements are the elements shown in the layout (in order).
+      -- Layouts are opened in order so that earlier layouts take priority in window sizing.
+      layouts = {
+        {
+          elements = {
+            -- Elements can be strings or table with id and size keys.
+            { id = "scopes", size = 0.25 },
+            "breakpoints",
+            "stacks",
+            "watches",
+          },
+          size = 40, -- 40 columns
+          position = "left",
+        },
+        {
+          elements = {
+            "repl",
+            -- "console",
+          },
+          size = 0.25, -- 25% of total lines
+          position = "bottom",
+        },
+      },
+    }
 
     -- require('nvim-dap-virtual-text').setup()
     require('mason-nvim-dap').setup {
@@ -121,6 +149,9 @@ return {
 
     -- toggle to see last session result. Without this ,you can't see session output in case of unhandled exception.
     vim.keymap.set("n", "<leader>tt", dapui.toggle)
+    vim.keymap.set('n', '<leader>tr', function()
+      dapui.open({ reset = true })
+    end, { desc = 'dap reset ui' })
     dap.listeners.after.event_initialized['dapui_config'] = dapui.open
     -- dap.listeners.before.event_terminated['dapui_config'] = dapui.close
     -- dap.listeners.before.event_exited['dapui_config'] = dapui.close
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
index 5f453a54..fd7dffe7 100644
--- a/lua/custom/plugins/go.lua
+++ b/lua/custom/plugins/go.lua
@@ -9,10 +9,11 @@ return {
 		"nvim-treesitter/nvim-treesitter",
 	},
 	config = function()
-		-- local gofmt = require("go.format")
 		require("go").setup()
 
-		-- vim.keymap.set('n', 'gF', gofmt.goimport, { desc = 'Go Import' })
+		local gofmt = require("go.format")
+
+		vim.keymap.set('n', 'gF', gofmt.goimport, { desc = 'Go Import' })
 	end,
 	event = { "CmdlineEnter" },
 	ft = { "go", 'gomod' },
diff --git a/lua/custom/plugins/null_ls.lua b/lua/custom/plugins/null_ls.lua
index 356bd399..815251e6 100644
--- a/lua/custom/plugins/null_ls.lua
+++ b/lua/custom/plugins/null_ls.lua
@@ -7,8 +7,8 @@ return {
 
 		null_ls.setup {
 			sources = {
-				null_ls.builtins.formatting.goimports_reviser,
-				-- null_ls.builtins.formatting.gofumpt,
+				-- null_ls.builtins.formatting.goimports_reviser,
+				null_ls.builtins.formatting.gofumpt,
 				-- null_ls.builtins.formatting.golines,
 			},
 			on_attach = function(client, bufnr)