diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua
index f5747c60..54599635 100644
--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@@ -3,6 +3,9 @@
 -- Add any additional options here
 vim.loader.enable()
 
+vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
+vim.o.foldcolumn = "1"
+
 vim.g.gui_font_default_size = 10
 vim.g.gui_font_size = vim.g.gui_font_default_size
 vim.g.gui_font_face = "JetBrainsMono Nerd Font"
diff --git a/.config/nvim/lua/plugins/better-escape.lua b/.config/nvim/lua/plugins/better-escape.lua
index 172dfce9..1e2e3208 100644
--- a/.config/nvim/lua/plugins/better-escape.lua
+++ b/.config/nvim/lua/plugins/better-escape.lua
@@ -1,7 +1,6 @@
 return {
     {
         "max397574/better-escape.nvim",
-        event = "VeryLazy",
         config = function()
             require("better_escape").setup({
                 mapping = { "jk", "jj", "kj", "jl" }, -- a table with mappings to use
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index 5ed0c09f..b2c9df52 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -28,6 +28,12 @@ return {
                         { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } },
                         { "filename", path = 1, symbols = { modified = "  ", readonly = "", unnamed = "" } },
                         -- stylua: ignore
+                        {
+                            function()
+                                local ok, m = pcall(require, "better_escape")
+                                return ok and m.waiting and "✺" or ""
+                            end,
+                        },
                     },
                     lualine_x = {
           -- stylua: ignore
@@ -63,12 +69,7 @@ return {
                         },
                     },
                     lualine_y = {
-                        {
-                            function()
-                                local ok, m = pcall(require, "better_escape")
-                                return ok and m.waiting and "✺" or ""
-                            end,
-                        },
+
                         { "progress", separator = " ", padding = { left = 1, right = 0 } },
                         { "location", padding = { left = 0, right = 1 } },
                     },
diff --git a/.config/nvim/lua/plugins/ufo.lua.bak b/.config/nvim/lua/plugins/ufo.lua.bak
deleted file mode 100644
index a997cb18..00000000
--- a/.config/nvim/lua/plugins/ufo.lua.bak
+++ /dev/null
@@ -1,47 +0,0 @@
-return {
-    {
-        "kevinhwang91/nvim-ufo",
-        dependencies = {
-            "kevinhwang91/promise-async",
-            {
-                "luukvbaal/statuscol.nvim",
-                config = function()
-                    local builtin = require("statuscol.builtin")
-                    require("statuscol").setup({
-                        relculright = true,
-                        segments = {
-                            { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
-                            { text = { "%s" }, click = "v:lua.ScSa" },
-                            { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
-                        },
-                    })
-                end,
-            },
-        },
-    --stylua: ignore
-    keys = {
-      { "zc" },
-      { "zo" },
-      { "zC" },
-      { "zO" },
-      { "za" },
-      { "zA" },
-      { "zr", function() require("ufo").openFoldsExceptKinds() end, desc = "Open Folds Except Kinds", },
-      { "zR", function() require("ufo").openAllFolds() end, desc = "Open All Folds", },
-      { "zM", function() require("ufo").closeAllFolds() end, desc = "Close All Folds", },
-      { "zm", function() require("ufo").closeFoldsWith() end, desc = "Close Folds With", },
-      { "zp", function()
-        local winid = require('ufo').peekFoldedLinesUnderCursor()
-        if not winid then
-          vim.lsp.buf.hover()
-        end
-      end, desc = "Peek Fold", },
-    },
-        opts = {
-            fold_virt_text_handler = handler,
-        },
-        config = function(_, opts)
-            require("ufo").setup(opts)
-        end,
-    },
-}