diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 70a32239083..c70e327771b 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -1,9 +1,7 @@
-
 /client/verb/who()
 	set name = "Who"
 	set category = "OOC"
 
-	var/header = "<b>Current Players:</b><br>"
 	var/count
 	var/msg
 	var/total_num = 0
@@ -11,30 +9,30 @@
 	if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights || R_DEV & holder.rights))
 		msg += "<table border='1' border-collapse='collapse' width='100%' style='border-collapse: collapse'>"
 
-		// table header
+		// Table Header
 		msg += "<tr>"
 		msg += "<td>Client Key</td>"
 		msg += "<td>Character</td>"
 		msg += "<td>Status</td>"
 		msg += "<td>Age</td>"
-		msg += "<td></td>"
-		msg += "<td></td>"
-		msg += "<td></td>"
+		msg += "<td>Ping</td>"
+		msg += "<td>Antag</td>"
+		msg += "<td>More Info</td>"
 		msg += "</tr>"
 
 		for(var/client/client in sortKey(GLOB.clients))
 			msg += "<tr>"
 
-			// client key
+			// Client Key
 			msg += "<td>[client.key]"
 			if(client.holder && client.holder.fakekey)
 				msg += " <i>(as [client.holder.fakekey])</i>"
 			msg += "</td>"
 
-			// character
+			// Character
 			msg += "<td>[client.mob.real_name]</td>"
 
-			// status
+			// Status
 			msg += "<td>"
 			switch(client.mob.stat)
 				if(UNCONSCIOUS)
@@ -45,14 +43,16 @@
 						if(O.started_as_observer)
 							msg += "<font color='gray'>Observing</font>"
 						else
-							msg += "<font color='black'><b>DEAD</b></font>"
+							msg += "<font color='black'><b>Dead</b></font>"
 					else if(isstoryteller(client.mob))
-						msg += "<font color='blue'><b>STORYTELLING</b></font>"
+						msg += "<font color='blue'><b>Storytelling</b></font>"
 					else
-						msg += "<font color='black'><b>DEAD</b></font>"
+						msg += "<font color='black'><b>Dead</b></font>"
+				else
+					msg += "<font color='green'><b>Alive</b></font>"
 			msg += "</td>"
 
-			// account age
+			// Account Age
 			var/age
 			if(isnum(client.player_age))
 				age = client.player_age
@@ -64,19 +64,19 @@
 				age = "<font color='#ff8c00'><b>[age]</b></font>"
 			msg += "<td>[age]</td>"
 
-			// ping
+			// Ping
 			if((R_ADMIN & holder.rights) || (R_DEV & holder.rights))
-				msg += "<td>[round(client.avgping, 1)]ms</td>"
+				msg += "<td>[round(client.avgping, 1)] ms</td>"
 			else
 				msg += "<td></td>"
 
-			// antag
+			// Antag
 			if(is_special_character(client.mob))
 				msg += "<td><b>Antagonist</b></td>"
 			else
 				msg += "<td></td>"
 
-			// more info button
+			// More Info
 			msg += "<td><A href='byond://?_src_=holder;adminmoreinfo=[REF(client.mob)]'>?</A></td>"
 
 			total_num++
@@ -91,13 +91,19 @@
 			total_num++
 			msg += "<br>"
 
-	count = "<b>Total Players: [total_num]</b><br>"
-	msg = header + count + msg
+	count = "<b>Current Players ([total_num])</b><br>"
+	msg = count + msg
 
 	var/datum/browser/who_win = new(usr, "who", "Who", 450, 500)
 	who_win.set_content(msg)
 	who_win.open()
 
+#define STAFFWHO_STATUS_OBSERVING " \[Observing\]"
+#define STAFFWHO_STATUS_LOBBY " \[Lobby\]"
+#define STAFFWHO_STATUS_STORYTELLING " \[Storytelling\]"
+#define STAFFWHO_STATUS_PLAYING " \[Playing\]"
+#define STAFFWHO_AFK " (AFK)"
+
 /client/verb/staffwho()
 	set category = "Admin"
 	set name = "Staffwho"
@@ -113,78 +119,78 @@
 	if(holder)
 		for(var/s in GLOB.staff)
 			var/client/client = s
-			if(R_ADMIN & client.holder.rights)	//Used to determine who shows up in admin rows
+			if(R_ADMIN & client.holder.rights) // Who shows up in admin rows.
 
-				if(client.holder.fakekey && !(R_ADMIN & holder.rights || R_MOD & holder.rights))		//Mentors can't see stealthmins
+				if(client.holder.fakekey && !(R_ADMIN & holder.rights || R_MOD & holder.rights))
 					continue
 
-				msg += "\t[client.key] is a [client.holder.rank]"
+				msg += "\t[client.key] · [client.holder.rank]"
 
 				if(client.holder.fakekey)
 					msg += " <i>(as [client.holder.fakekey])</i>"
 
 				if(isobserver(client.mob))
-					msg += " - Observing"
+					msg += STAFFWHO_STATUS_OBSERVING
 				else if(isnewplayer(client.mob))
-					msg += " - Lobby"
+					msg += STAFFWHO_STATUS_LOBBY
 				else if(isstoryteller(client.mob))
-					msg += "- Storytelling"
+					msg += STAFFWHO_STATUS_STORYTELLING
 				else
-					msg += " - Playing"
+					msg += STAFFWHO_STATUS_PLAYING
 
 				if(client.is_afk())
-					msg += " (AFK)"
+					msg += STAFFWHO_AFK
 				msg += "<br>"
 
 				num_admins_online++
-			else if(R_MOD & client.holder.rights)				//Who shows up in mod/mentor rows.
-				modmsg += "\t[client.key] is a [client.holder.rank]"
+			else if(R_MOD & client.holder.rights) // Who shows up in mod rows.
+				modmsg += "\t[client.key] · [client.holder.rank]"
 
 				if(isobserver(client.mob))
-					modmsg += " - Observing"
+					modmsg += STAFFWHO_STATUS_OBSERVING
 				else if(isnewplayer(client.mob))
-					modmsg += " - Lobby"
+					modmsg += STAFFWHO_STATUS_LOBBY
 				else if(isstoryteller(client.mob))
-					modmsg += "- Storytelling"
+					modmsg += STAFFWHO_STATUS_STORYTELLING
 				else
-					modmsg += " - Playing"
+					modmsg += STAFFWHO_STATUS_PLAYING
 
 				if(client.is_afk())
-					modmsg += " (AFK)"
+					modmsg += STAFFWHO_AFK
 				modmsg += "<br>"
 				num_mods_online++
 
-			else if (R_CCIAA & client.holder.rights)
-				cciaamsg += "\t[client.key]"
+			else if(R_CCIAA & client.holder.rights) // Who shows up in CCIAA rows.
+				cciaamsg += "\t[client.key] · [client.holder.rank]"
 
 				if(isobserver(client.mob))
-					cciaamsg += " - Observing"
+					cciaamsg += STAFFWHO_STATUS_OBSERVING
 				else if(isnewplayer(client.mob))
-					cciaamsg += " - Lobby"
+					cciaamsg += STAFFWHO_STATUS_LOBBY
 				else if(isstoryteller(client.mob))
-					cciaamsg += "- Storytelling"
+					cciaamsg += STAFFWHO_STATUS_STORYTELLING
 				else
-					cciaamsg += " - Playing"
+					cciaamsg += STAFFWHO_STATUS_PLAYING
 
-				if (client.is_afk())
-					cciaamsg += " (AFK)"
+				if(client.is_afk())
+					cciaamsg += STAFFWHO_AFK
 				cciaamsg += "<br>"
 				num_cciaa_online++
 
-			else if(client.holder.rights & R_DEV)
-				devmsg += "\t[client.key] is a [client.holder.rank]"
+			else if(client.holder.rights & R_DEV) // Who shows up in dev rows.
+				devmsg += "\t[client.key] · [client.holder.rank]"
 
 				if(isobserver(client.mob))
-					devmsg += " - Observing"
+					devmsg += STAFFWHO_STATUS_OBSERVING
 				else if(isnewplayer(client.mob))
-					devmsg += " - Lobby"
+					devmsg += STAFFWHO_STATUS_LOBBY
 				else if(isstoryteller(client.mob))
-					devmsg += "- Storytelling"
+					devmsg += STAFFWHO_STATUS_STORYTELLING
 				else
-					devmsg += " - Playing"
+					devmsg += STAFFWHO_STATUS_PLAYING
 
 				if(client.is_afk())
-					devmsg += " (AFK)"
+					devmsg += STAFFWHO_AFK
 				devmsg += "<br>"
 				num_devs_online++
 	else
@@ -193,42 +199,49 @@
 			if(R_ADMIN & client.holder.rights)
 				if(!client.holder.fakekey)
 					if(client.is_afk())
-						msg += "\t[client.key] is a [client.holder.rank] (AFK)<br>"
+						msg += "\t[client.key] · [client.holder.rank] (AFK)<br>"
 					else
-						msg += "\t[client.key] is a [client.holder.rank]<br>"
+						msg += "\t[client.key] · [client.holder.rank]<br>"
 					num_admins_online++
-			else if (R_MOD & client.holder.rights)
+			else if(R_MOD & client.holder.rights)
 				if(client.is_afk())
-					modmsg += "\t[client.key] is a [client.holder.rank] (AFK)<br>"
+					modmsg += "\t[client.key] · [client.holder.rank] (AFK)<br>"
 				else
-					modmsg += "\t[client.key] is a [client.holder.rank]<br>"
+					modmsg += "\t[client.key] · [client.holder.rank]<br>"
 				num_mods_online++
 			else if(client.holder.rights & R_DEV)
 				if(client.is_afk())
-					devmsg += "\t[client.key] is a [client.holder.rank] (AFK)<br>"
+					devmsg += "\t[client.key] · [client.holder.rank] (AFK)<br>"
 				else
-					devmsg += "\t[client.key] is a [client.holder.rank]<br>"
+					devmsg += "\t[client.key] · [client.holder.rank]<br>"
 				num_devs_online++
-			else if (R_CCIAA & client.holder.rights)
+			else if(R_CCIAA & client.holder.rights)
 				if(client.is_afk())
-					cciaamsg += "\t[client.key] is a [client.holder.rank] (AFK)<br>"
+					cciaamsg += "\t[client.key] · [client.holder.rank] (AFK)<br>"
 				else
-					cciaamsg += "\t[client.key] is a [client.holder.rank]<br>"
+					cciaamsg += "\t[client.key] · [client.holder.rank]<br>"
 				num_cciaa_online++
 
 	if(SSdiscord && SSdiscord.active)
-		to_chat(src, "<span class='info'>Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond.</span>")
-	msg = "<b>Current Admins ([num_admins_online]):</b><br>" + msg
+		to_chat(src, SPAN_INFO("Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond."))
+
+	msg = "<b>Current Administrators ([num_admins_online])</b><br>" + msg
 
 	if(GLOB.config.show_mods)
-		msg += "<br><b>Current Moderators ([num_mods_online]):</b><br>" + modmsg
+		msg += "<br><b>Current Moderators ([num_mods_online])</b><br>" + modmsg
 
-	if (GLOB.config.show_auxiliary_roles)
-		if (num_cciaa_online)
-			msg += "<br><b>Current CCIA Agents ([num_cciaa_online]):</b><br>" + cciaamsg
+	if(GLOB.config.show_auxiliary_roles)
+		if(num_cciaa_online)
+			msg += "<br><b>Current CCIA Agents ([num_cciaa_online])</b><br>" + cciaamsg
 		if(num_devs_online)
-			msg += "<br><b>Current Developers ([num_devs_online]):</b><br>" + devmsg
+			msg += "<br><b>Current Developers ([num_devs_online])</b><br>" + devmsg
 
 	var/datum/browser/staff_win = new(usr, "staffwho", "Staff Who", 450, 500)
 	staff_win.set_content(msg)
 	staff_win.open()
+
+#undef STAFFWHO_STATUS_OBSERVING
+#undef STAFFWHO_STATUS_LOBBY
+#undef STAFFWHO_STATUS_STORYTELLING
+#undef STAFFWHO_STATUS_PLAYING
+#undef STAFFWHO_AFK
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index e2759d4ca3e..d17c027d552 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -833,7 +833,7 @@
 			dat += "Special Role Desc: [special_role_description]<br>"
 		dat += "(<a href='byond://?src=[REF(usr)];priv_msg=[REF(M)]'>PM</a>) (<A href='byond://?src=[REF(src)];adminplayeropts=[REF(M)]'>PP</A>) (<A href='byond://?_src_=vars;Vars=[REF(M)]'>VV</A>) (<A href='byond://?src=[REF(src)];subtlemessage=[REF(M)]'>SM</A>) ([admin_jump_link(M, src)]) (<A href='byond://?src=[REF(src)];secretsadmin=check_antagonist'>CA</A>)"
 
-		var/datum/browser/extrainfo_win = new(usr, "extrainfo", "Extra Info (M.name)", 450, 500)
+		var/datum/browser/extrainfo_win = new(usr, "extrainfo", "Extra Info", 450, 500)
 		extrainfo_win.set_content(dat)
 		extrainfo_win.open()
 
diff --git a/html/changelogs/SleepyGemmy-staffwho_fix.yml b/html/changelogs/SleepyGemmy-staffwho_fix.yml
new file mode 100644
index 00000000000..11ed56665bd
--- /dev/null
+++ b/html/changelogs/SleepyGemmy-staffwho_fix.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - rscadd: "Tweaked the \"Who\" and \"Staff Who\" interfaces."