diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 5762456..073be38 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -56,8 +56,8 @@ keymap("i", "<C-Z>", "<esc><cmd>undo<CR>", opts)
 keymap("n", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", opts)
 keymap("v", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", opts)
 keymap("i", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", opts)
-keymap("i", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>$i<Right><leader>", opts)
-keymap("n", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>$i<Right><leader>", opts)
+keymap("i", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>i", opts)
+keymap("n", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>i", opts)
 -- keymap("n", "<C-l>", "<esc><cmd>lua _LIVE_SERVER()<cr>", opts)
 -- keymap("i", "<C-l>", "<esc><cmd>lua _LIVE_SERVER()<cr>", opts)
 
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index c129e82..4542689 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -329,9 +329,14 @@ local mappings = {
 		f = { "<cmd>RunFile<CR>", "Run File" },
 		p = { "<cmd>RunProject<CR>", "Run Project" },
 		g = { "<cmd>terminal gradle run<cr>", "Run Gradle" },
+		-- m = {
+		-- 	"<cmd>terminal mvn package<cr>",
+		-- 	"MVN Build",
+		-- },
 		m = {
-			"<cmd>ToggleTerm size=70 direction=float<cr>mvn exec:java -Dexec.mainClass=com.pojokcode.App<cr>",
-			"Run MVN",
+			name = "Maven",
+			b = { "<cmd>terminal mvn package<cr>", "MVN Build" },
+			r = { "<cmd>terminal java -jar target/my-app.jar<cr>", "Run JAR" },
 		},
 	},
 	-- D = {