diff --git a/config/menus.cfg b/config/menus.cfg
index ce352921..eb0d3b06 100644
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -62,7 +62,7 @@ menudirlist demos dmo "demo $arg1" 0 searchdemo
 
 newmenu [search demo]
 menuitemtextinput "Part of demo name or description: " "result $searchdemo" [ searchdemo = $arg1 ]
-menuitem "\f2\t\t      Search demo" [ showmenu [search specific demo] ]
+menuitem "\f2\t\t    [ Search demo ]" [ showmenu [search specific demo] ]
 
 // in-game menu that opens when pressing escape while watching a demo.
 newmenu [Watching demo]
diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg
index 5a6b1034..b247399c 100644
--- a/config/menus_bot.cfg
+++ b/config/menus_bot.cfg
@@ -94,8 +94,8 @@ menudirlist "packages/maps" cgz [map $arg1] 0 searchmap
 
 newmenu [search map]
 menuitemtextinput "Part of map name or description: " "result $searchmap" [ searchmap = $arg1 ]
-menuitem "\f2\t\tSearch in official maps" [ showmenu [search official map] ]
-menuitem "\f2\t\tSearch in custom maps"   [ showmenu [search custom map] ]
+menuitem "\f2\t       [ Search in official maps ]" [ showmenu [search official map] ]
+menuitem "\f2\t       [ Search in custom maps ]"   [ showmenu [search custom map] ]
 
 const showmenu_enemies [ if ($tmp_isbotteammode) [ showmenu [team enemies] ] [ showmenu enemies ] ]
 
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index fe713545..4f00359e 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -553,7 +553,8 @@ loop tsl (listlen $DEFAULT_SCOREBOARD_ORDER) [
 ]
 menuitem [] -1
 menuitem [Reset to default scoreboard...] [ loop rsl (listlen $DEFAULT_SCOREBOARD_ORDER) [ (at $DEFAULT_SCOREBOARD_ORDER $rsl) (at $DEFAULT_SCOREBOARD_POSITIONS $rsl) ]; refreshcurmenudelayed ]
-menuitem [Close] [ closecurmenu ]
+menuitem [] -1
+menuitem "\t\t\f2[ Back ]" [ closecurmenu ]
 
 alias wallclockformat "" // strftime formatting
 alias wallclockformatlist ["" %H:%M %H:%M:%S %I:%M%p %I:%M:%S%p U%H:%M U%H:%M:%S] //"U" at beginning means UTC/GMT time
diff --git a/config/opt/faq.cfg b/config/opt/faq.cfg
index 233e33ed..d3a725c8 100644
--- a/config/opt/faq.cfg
+++ b/config/opt/faq.cfg
@@ -101,7 +101,6 @@ loop i (listlen $faqQuestions) [
   delalias $tmpMenuAlias
   menuitem "" -1
 ]
-menuitem [] -1
-menuitem [     Close] [ closecurmenu ]
+menuitem "\t\t\t\t\t\f2[ Back ]" [ closecurmenu ]
 
 delalias faqQuestions
diff --git a/config/opt/survival.cfg b/config/opt/survival.cfg
index bd316a70..65851e60 100644
--- a/config/opt/survival.cfg
+++ b/config/opt/survival.cfg
@@ -34,14 +34,14 @@ resetSurvAliases
 // build menus
 const survSetsList [survNumBots survBotsToAdd timeBetChkPts timeUntilTele survMaxBots]
 const survDifList ["6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 40" "12 5 10000 20000 50"]
-const survSetDif [if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo "\f3Error: \f5invalid difficulty, defaulting to (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ]
+const survSetDif [if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo "\f3Error: \f5invalid difficulty, defaulting to" (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ]
 
 newmenu [Survival Mode]
 menuitemslider "Map: " 0 (- (listlen $defaultmaps) 1) "$survMap" 1 [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk] [ survMap = $arg1 ]
 menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [easy intermediate hard impossible] [ survSetDif $arg1 ]
 menuitem [] -1
-menuitem "\t\t\tCustomize" [ showmenu [Survival Mode - Customize] ]
-menuitem "\t\t\tStart!"    [ survival (at $defaultmaps $survMap) ]
+menuitem "\t\t  Customize..." [ showmenu [Survival Mode - Customize] ]
+menuitem "\t\t\f2  [ Start! ]"    [ survival (at $defaultmaps $survMap) ]
 
 newmenu [Survival Mode - Customize]
 menuitemcheckbox "Enable survival damage effects (uses gamespeed/gamma)" "$survDamageEffects" [ survDamageEffects = $arg1 ]
@@ -52,7 +52,7 @@ menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntil
 menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ]
 menuitemslider "Spam survival mode messages: " 0 1 "$spamSurvMsgs" 1 [ no yes ] [ spamSurvMsgs = $arg1 ]
 menuitem [] -1
-menuitem [                                   Back] [ closecurmenu ]
+menuitem "\t\t\t\f2       [ Back ]" [ closecurmenu ]
 
 const genSurvDifStr [
   if $nonSurvDefaults [ result "[CUSTOM]" ] [
diff --git a/source/src/client.cpp b/source/src/client.cpp
index b754127a..d9507b00 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -185,6 +185,7 @@ void disconnect(int onlyclean, int async)
         player1->clientnum = -1;
         player1->lifesequence = 0;
         player1->clientrole = CR_DEFAULT;
+        lastpm = -1;
         kickallbots();
         loopv(players) zapplayer(players[i]);
         clearvote();
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 7d51557c..e375a8f0 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -241,7 +241,6 @@ char *mlayout = NULL;
 int Mv = 0, Ma = 0, F2F = 1000 * MINFF; // moved up:, MA = 0;
 float Mh = 0;
 extern int connected;
-extern int lastpm;
 extern bool noflags;
 bool item_fail = false;
 int map_quality = MAP_IS_EDITABLE;
diff --git a/source/src/protos.h b/source/src/protos.h
index 3256f95c..5839d849 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -555,6 +555,7 @@ extern void setskin(playerent *pl, int skin, int team = -1);
 extern void callvote(int type, const char *arg1 = NULL, const char *arg2 = NULL, const char *arg3 = NULL);
 extern void addsleep(int msec, const char *cmd, bool persist = false);
 extern void resetsleep(bool force = false);
+extern int lastpm;
 //game mode extras
 extern void flagpickup(int fln);
 extern void tryflagdrop(bool manual = false);