diff --git a/dot_config/nvim/autoload/go.vim b/dot_config/nvim/autoload/go.vim
deleted file mode 100644
index 612c5df..0000000
--- a/dot_config/nvim/autoload/go.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-function! go#Gofmt(path) abort
-    let cmd = 'gofmt -w '.a:path
-    call system(cmd)
-    let winstate = winsaveview()
-    exec 'edit!'
-    call winrestview(winstate)
-endfunction
diff --git a/dot_config/nvim/lua/configs/fterm.lua b/dot_config/nvim/lua/configs/fterm.lua
index 5d0e28b..a6995f7 100644
--- a/dot_config/nvim/lua/configs/fterm.lua
+++ b/dot_config/nvim/lua/configs/fterm.lua
@@ -13,15 +13,10 @@ function M.setup()
     }
   })
 
-  -- Use this to toggle gitui in a floating terminal
-  vim.keymap.set('n', '<Space>g', function()
-    lazygit:toggle()
-  end)
-
-  vim.keymap.set('n', '<Space>H', function()
+  local git_history = function()
     local file = vim.api.nvim_buf_get_name(0)
     local cmd = 'git log -p --ext-diff ' .. file
-    local git_history = fterm:new({
+    fterm.scratch({
       -- ft = 'git_history', -- You can also override the default filetype, if you want
       cmd = cmd,
       dimensions = {
@@ -29,9 +24,10 @@ function M.setup()
         width = 0.9
       }
     })
+  end
 
-    git_history:open()
-  end)
+  vim.keymap.set('n', '<Space>g', function() lazygit:toggle() end,{ desc = 'Toggle lazygit'} )
+  vim.keymap.set('n', '<Space>H', git_history, { desc = 'Show git history'})
 end
 
 return M
diff --git a/dot_config/nvim/lua/configs/misc.lua b/dot_config/nvim/lua/configs/misc.lua
index 38ece1c..5155da1 100644
--- a/dot_config/nvim/lua/configs/misc.lua
+++ b/dot_config/nvim/lua/configs/misc.lua
@@ -28,9 +28,7 @@ vim.api.nvim_create_autocmd('TermOpen', {
     -- local buf = args.buf
     vim.api.nvim_win_set_option(0, 'number', false)
     vim.api.nvim_win_set_option(0, 'signcolumn', 'no')
-    -- vim.wo.number = false
-    -- vim.wo.signcolumn = 'no'
-    vim.cmd('startinsert')
+    vim.schedule(vim.cmd.startinsert) -- without schedule it lock screen refresh
   end
 })
 --}}}