diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 1e081069612..ba05c0d7351 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -9,44 +9,77 @@
 	var/total_num = 0
 
 	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
+		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 += "</tr>"
+
 		for(var/client/client in sortKey(GLOB.clients))
-			msg += "\t[client.key]"
+			msg += "<tr>"
+
+			// client key
+			msg += "<td>[client.key]"
 			if(client.holder && client.holder.fakekey)
 				msg += " <i>(as [client.holder.fakekey])</i>"
-			msg += " - Playing as [client.mob.real_name]"
+			msg += "</td>"
+
+			// character
+			msg += "<td>[client.mob.real_name]</td>"
+
+			// status
+			msg += "<td>"
 			switch(client.mob.stat)
 				if(UNCONSCIOUS)
-					msg += " - <font color='darkgray'><b>Unconscious</b></font>"
+					msg += "<font color='darkgray'><b>Unconscious</b></font>"
 				if(DEAD)
 					if(isobserver(client.mob))
 						var/mob/abstract/observer/O = client.mob
 						if(O.started_as_observer)
-							msg += " - <font color='gray'>Observing</font>"
+							msg += "<font color='gray'>Observing</font>"
 						else
-							msg += " - <font color='black'><b>DEAD</b></font>"
+							msg += "<font color='black'><b>DEAD</b></font>"
 					else
-						msg += " - <font color='black'><b>DEAD</b></font>"
+						msg += "<font color='black'><b>DEAD</b></font>"
+			msg += "</td>"
 
+			// account age
 			var/age
 			if(isnum(client.player_age))
 				age = client.player_age
 			else
 				age = 0
-
 			if(age <= 1)
 				age = "<font color='#ff0000'><b>[age]</b></font>"
 			else if(age < 10)
 				age = "<font color='#ff8c00'><b>[age]</b></font>"
+			msg += "<td>[age]</td>"
 
-			msg += " - [age]"
+			// ping
 			if((R_ADMIN & holder.rights) || (R_DEV & holder.rights))
-				msg += " ([round(client.avgping, 1)]ms)"
+				msg += "<td>[round(client.avgping, 1)]ms</td>"
+			else
+				msg += "<td></td>"
 
+			// antag
 			if(is_special_character(client.mob))
-				msg += " - <b><span class='warning'>Antagonist</span></b>"
-			msg += " (<A HREF='?_src_=holder;adminmoreinfo=\ref[client.mob]'>?</A>)"
-			msg += "<br>"
+				msg += "<td><b>Antagonist</b></td>"
+			else
+				msg += "<td></td>"
+
+			// more info button
+			msg += "<td><A HREF='?_src_=holder;adminmoreinfo=[REF(client.mob)]'>?</A></td>"
+
 			total_num++
+			msg += "</tr>"
+		msg += "</table>"
 	else
 		for(var/client/client in sortKey(GLOB.clients))
 			if(client.holder && client.holder.fakekey)
diff --git a/html/changelogs/DreamySkrell-better-staff-who.yml b/html/changelogs/DreamySkrell-better-staff-who.yml
new file mode 100644
index 00000000000..c9fa08a9282
--- /dev/null
+++ b/html/changelogs/DreamySkrell-better-staff-who.yml
@@ -0,0 +1,7 @@
+
+author: DreamySkrell
+
+delete-after: True
+
+changes:
+  - rscadd: "Better staff who verb window."