diff --git a/builtin/mainmenu/tab_mods.lua b/builtin/mainmenu/tab_mods.lua
index 7b9878735..d16ecca8c 100644
--- a/builtin/mainmenu/tab_mods.lua
+++ b/builtin/mainmenu/tab_mods.lua
@@ -96,7 +96,7 @@ local function get_formspec(tabview, name, tabdata)
 		else
 			--show dependencies
 
-			retval = retval .. "," .. fgettext("Depends:") .. ","
+			retval = retval .. ",Depends:,"
 
 			local toadd = modmgr.get_dependencies(selected_mod.path)
 
diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index 2026ece35..ce24e54ae 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -1042,7 +1042,7 @@ msgstr "Neplatná specifikace hry."
 #~ msgid "You died."
 #~ msgstr "Zemřel jsi."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Vypínám to..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/de/minetest.po b/po/de/minetest.po
index 02af019bf..83f0c7133 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -1119,7 +1119,7 @@ msgstr "Invalide Spielspezif."
 #~ msgid "You died."
 #~ msgstr "Sie sind gestorben."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Herunterfahren..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index 237f4fd17..8b65af0ff 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -1124,7 +1124,7 @@ msgstr "gamespec invalide."
 #~ msgid "You died."
 #~ msgstr "Vous êtes mort."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Quitter le jeu..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/hu/minetest.po b/po/hu/minetest.po
index a62dad293..d49bc782b 100644
--- a/po/hu/minetest.po
+++ b/po/hu/minetest.po
@@ -1094,7 +1094,7 @@ msgstr "Nem valós játék spec."
 #~ msgid "You died."
 #~ msgstr "Meghaltál."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Dolog leállítása..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/id/minetest.po b/po/id/minetest.po
index 484da447a..fd6cba2c3 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -1040,7 +1040,7 @@ msgstr "Spesifikasi permainan tidak sah."
 #~ msgid "You died."
 #~ msgstr "Kamu mati."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Mematikan..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/it/minetest.po b/po/it/minetest.po
index 819882788..ef8ebc58e 100644
--- a/po/it/minetest.po
+++ b/po/it/minetest.po
@@ -1041,7 +1041,7 @@ msgstr "Specifica del gioco non valida."
 #~ msgid "You died."
 #~ msgstr "Siete morti."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Spegnimento della roba..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/ky/minetest.po b/po/ky/minetest.po
index b1fc70d21..47da737bd 100644
--- a/po/ky/minetest.po
+++ b/po/ky/minetest.po
@@ -1116,7 +1116,7 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Сиз өлдүңүз."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Оюн өчүрүлүүдө..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index ae64f8434..c81353d43 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -1128,7 +1128,7 @@ msgstr "Onjuiste gamespec."
 #~ msgid "You died."
 #~ msgstr "Je bent gestorven."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Stopzetten..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index e607abb26..c49c340cd 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -1135,7 +1135,7 @@ msgstr "Nieprawidłowa specyfikacja trybu gry."
 #~ msgid "You died."
 #~ msgstr "Zginąłeś."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Wyłączanie..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index 1d8403735..24680e2d4 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -1131,7 +1131,7 @@ msgstr "gamespec inválido."
 #~ msgid "You died."
 #~ msgstr "Morreste."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "A desligar..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 1179000ca..b8b68a661 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -1132,7 +1132,7 @@ msgstr "Especificação do jogo inválida."
 #~ msgid "You died."
 #~ msgstr "Você morreu."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Desligando tudo..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/ro/minetest.po b/po/ro/minetest.po
index 429bdd7c4..eefdd5f22 100644
--- a/po/ro/minetest.po
+++ b/po/ro/minetest.po
@@ -1042,7 +1042,7 @@ msgstr "Specificare invalidă"
 #~ msgid "You died."
 #~ msgstr "Ai murit."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Se închide..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index ce1b6f509..5d9d16deb 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -1129,7 +1129,7 @@ msgstr "Неправильная конфигурация игры."
 #~ msgid "You died."
 #~ msgstr "Вы умерли."
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "Завершение работы..."
 
 #~ msgid "Connecting to server..."
diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index e2cd4426c..e0b96ce15 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -1125,7 +1125,7 @@ msgstr "非法游戏模式规格。"
 #~ msgid "You died."
 #~ msgstr "你死了。"
 
-#~ msgid "Shutting down..."
+#~ msgid "Shutting down stuff..."
 #~ msgstr "关闭中......"
 
 #~ msgid "Connecting to server..."
diff --git a/src/game.cpp b/src/game.cpp
index c82269a85..cedaabb1b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1055,7 +1055,7 @@ static void show_deathscreen(GUIFormSpecMenu **cur_formspec,
 		std::string(FORMSPEC_VERSION_STRING) +
 		SIZE_TAG
 		"bgcolor[#320000b4;true]"
-		"label[4.85,1.35;" + gettext("You died.") + "]"
+		"label[4.85,1.35;You died.]"
 		"button_exit[4,3;3,0.5;btn_respawn;" + gettext("Respawn") + "]"
 		;
 
diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 5fa737aae..8b0bb8278 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -173,7 +173,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		s32 option_x = offset.X + 10;
 		s32 option_y = offset.Y;
-		u32 option_w = 260;
+		u32 option_w = 220;
 		{
 			core::rect<s32> rect(0, 0, option_w, 30);
 			rect += topleft + v2s32(option_x, option_y);
diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index c747f9b8b..c8a2214b6 100644
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -101,8 +101,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 	*/
 	s32 ypos = 50;
 	{
-		core::rect<s32> rect(0, 0, 150, 20);
-		rect += topleft_client + v2s32(25, ypos+6);
+		core::rect<s32> rect(0, 0, 110, 20);
+		rect += topleft_client + v2s32(35, ypos+6);
 		wchar_t* text = wgettext("Old Password");
 		Environment->addStaticText(text, rect, false, true, this, -1);
 		delete[] text;
@@ -117,8 +117,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 	}
 	ypos += 50;
 	{
-		core::rect<s32> rect(0, 0, 150, 20);
-		rect += topleft_client + v2s32(25, ypos+6);
+		core::rect<s32> rect(0, 0, 110, 20);
+		rect += topleft_client + v2s32(35, ypos+6);
 		wchar_t* text = wgettext("New Password");
 		Environment->addStaticText(text, rect, false, true, this, -1);
 		delete[] text;
@@ -132,8 +132,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 	}
 	ypos += 50;
 	{
-		core::rect<s32> rect(0, 0, 150, 20);
-		rect += topleft_client + v2s32(25, ypos+6);
+		core::rect<s32> rect(0, 0, 110, 20);
+		rect += topleft_client + v2s32(35, ypos+6);
 		wchar_t* text = wgettext("Confirm Password");
 		Environment->addStaticText(text, rect, false, true, this, -1);
 		delete[] text;