diff --git a/config/menus.cfg b/config/menus.cfg
index a2114c71..ccbd3ba8 100755
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -26,7 +26,7 @@ alias genmapitems [
     ]
 ]
 newmenu maps
-// Add maps to the below list to include them in the CTF map menu.
+// Add maps to the below list to include them in the normal map menu (also for botmaps).
 alias defaultmaps "ac_arctic ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_elevation ac_keller ac_mines ac_power ac_scaffold ac_shine ac_snow ac_sunset ac_toxic ac_urban"
 genmapitems	$defaultmaps
 menuitem	""""
@@ -44,20 +44,6 @@ genmapitems $ctfmaps
 menuitem """"
 menuitem "Show all maps.." [showmenu "all maps"]
 
-newmenu botmaps
-
-alias genbotmaps [
-	loop i (listlen $arg1) [
-		alias listmapname (at $arg1 $i)
-		alias menutext $listmapname (concat map $listmapname)
-		menuitem $menutext (concat "alias tmp_botmap" $listmapname "; startbotmap")
-	]
-]
-// Add maps to the below list to include them in the bot map menu.
-alias botmaps $defaultmaps
-genbotmaps $botmaps
-
-
 
 newmenu demo
 
diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg
index 7e2cbee4..e8fce5c2 100644
--- a/config/menus_bot.cfg
+++ b/config/menus_bot.cfg
@@ -1,5 +1,16 @@
 // bot menus and tools
 
+newmenu botmaps
+
+alias genbotmaps [
+	loop i (listlen $arg1) [
+		alias listmapname (at $arg1 $i)
+		alias menutext $listmapname (concat map $listmapname)
+		menuitem $menutext (concat "alias tmp_botmap" $listmapname "; startbotmap")
+	]
+]
+genbotmaps $defaultmaps
+
 alias tmp_botskill good
 alias tmp_numbots 1
 alias tmp_mode
@@ -127,7 +138,7 @@ menuitem "Set waypoint as jumpable"		"setjumpwp"
 menuitem "Unset waypoint as jumpable"		"unsetjumpwp"
 menuitem "Set waypoint direction (yaw)"		"setwpyaw"
 menuitem """"
-menuitemslider "Waypoint visibility: " 0 1 "($wpvisible)" 1 ["Hide waypoints" "Show waypoints"] "wpvisible $arg1"
+menuitemslider "Waypoint visibility: " 0 1 " " 1 ["Hide waypoints" "Show waypoints"] "wpvisible $arg1"
 menuitemslider "Select/place waypoints by: " 0 1 "($xhairwpsel)" 1 ["Your current location" "Clicking a point on the grid"] "xhairwpsel $arg1"