diff --git a/src/menus/options-server-1.c b/src/menus/options-server-1.c
index 2b85ab610..2333c5e43 100644
--- a/src/menus/options-server-1.c
+++ b/src/menus/options-server-1.c
@@ -6,9 +6,16 @@
 menuitem_t OPTIONS_Server[] =
 {
 
+	{IT_HEADER, "Advertising...", NULL,
+		NULL, {NULL}, 0, 0},
+
 	{IT_STRING | IT_CVAR | IT_CV_STRING, "Server Name", "Change the name of your server.",
 		NULL, {.cvar = &cv_servername}, 0, 0},
 
+
+	{IT_HEADER, "Progression...", NULL,
+		NULL, {NULL}, 0, 0},
+
 	{IT_STRING | IT_CVAR, "Intermission", "Set how long to stay on the result screen.",
 		NULL, {.cvar = &cv_inttime}, 0, 0},
 
@@ -19,7 +26,7 @@ menuitem_t OPTIONS_Server[] =
 		NULL, {.cvar = &cv_votetime}, 0, 0},
 
 
-	{IT_SPACE | IT_NOTHING, NULL,  NULL,
+	{IT_HEADER, "Joining...", NULL,
 		NULL, {NULL}, 0, 0},
 
 	{IT_STRING | IT_CVAR, "Maximum Players", "How many players can play at once.",
@@ -37,13 +44,18 @@ menuitem_t OPTIONS_Server[] =
 	{IT_STRING | IT_CVAR, "Pause Permissions", "Sets who can pause the game.",
 		NULL, {.cvar = &cv_pause}, 0, 0},
 
+
+	{IT_HEADER, "Chat...", NULL,
+		NULL, {NULL}, 0, 0},
+
 	{IT_STRING | IT_CVAR, "Mute Chat", "Prevents non-admins from sending chat messages.",
 		NULL, {.cvar = &cv_mute}, 0, 0},
 
 	{IT_STRING | IT_CVAR, "Chat Spam Protection", "Prevents too many message from a single player.",
 		NULL, {.cvar = &cv_chatspamprotection}, 0, 0},
 
-	{IT_SPACE | IT_NOTHING, NULL,  NULL,
+
+	{IT_SPACE | IT_DYBIGSPACE, NULL,  NULL,
 		NULL, {NULL}, 0, 0},
 
 	{IT_STRING | IT_SUBMENU, "Advanced...", "Advanced options. Be careful when messing with these!",
diff --git a/src/menus/options-server-advanced.c b/src/menus/options-server-advanced.c
index 321dcddf1..055954e94 100644
--- a/src/menus/options-server-advanced.c
+++ b/src/menus/options-server-advanced.c
@@ -6,9 +6,16 @@
 menuitem_t OPTIONS_ServerAdvanced[] =
 {
 
+	{IT_HEADER, "Master Server", NULL,
+		NULL, {NULL}, 0, 0},
+
 	{IT_STRING | IT_CVAR | IT_CV_STRING, "Server Browser Address", "Default is \'https://ms.kartkrew.org/ms/api\'",
 		NULL, {.cvar = &cv_masterserver}, 0, 0},
 
+
+	{IT_HEADER, "Network Connection", NULL,
+		NULL, {NULL}, 0, 0},
+
 	{IT_STRING | IT_CVAR, "Resynch. Attempts", "How many times to attempt sending data to desynchronized players.",
 		NULL, {.cvar = &cv_resynchattempts}, 0, 0},
 
@@ -24,7 +31,8 @@ menuitem_t OPTIONS_ServerAdvanced[] =
 	{IT_STRING | IT_CVAR, "Join Timeout (tics)", "Players taking too long to join are kicked.",
 		NULL, {.cvar = &cv_jointimeout}, 0, 0},
 
-	{IT_SPACE | IT_NOTHING, NULL,  NULL,
+
+	{IT_HEADER, "Addon Downloading", NULL,
 		NULL, {NULL}, 0, 0},
 
 	{IT_STRING | IT_CVAR, "Max File Transfer", "Maximum size of the files that can be downloaded from joining clients. (KB)",
@@ -33,7 +41,8 @@ menuitem_t OPTIONS_ServerAdvanced[] =
 	{IT_STRING | IT_CVAR, "File Transfer Speed", "File transfer packet rate. Larger values send more data.",
 		NULL, {.cvar = &cv_downloadspeed}, 0, 0},
 
-	{IT_SPACE | IT_NOTHING, NULL,  NULL,
+
+	{IT_HEADER, "Logging", NULL,
 		NULL, {NULL}, 0, 0},
 
 	{IT_STRING | IT_CVAR, "Log Joiner IPs", "Shows the IP of connecting players.",
diff --git a/src/menus/options-video-gl.c b/src/menus/options-video-gl.c
index 739f646ba..06fbcc8ac 100644
--- a/src/menus/options-video-gl.c
+++ b/src/menus/options-video-gl.c
@@ -51,7 +51,7 @@ menu_t OPTIONS_VideoOGLDef = {
 	&OPTIONS_VideoDef,
 	0,
 	OPTIONS_VideoOGL,
-	32, 80,
+	48, 80,
 	SKINCOLOR_PLAGUE, 0,
 	MBF_DRAWBGWHILEPLAYING,
 	NULL,