diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index b152f070426..a31cab5020b 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -480,10 +480,11 @@
 						while(src.active2.fields[text("com_[]", counter)])
 							P.info += text("[]<BR>", src.active2.fields[text("com_[]", counter)])
 							counter++
+						P.name = text("MR-[] '[]'", data_core.medicalPrintCount, src.active1.fields["name"])
 					else
 						P.info += "<B>Medical Record Lost!</B><BR>"
+						P.name = text("MR-[] '[]'", data_core.medicalPrintCount, "Record Lost")
 					P.info += "</TT>"
-					P.name = text("MR-[] '[]'", data_core.medicalPrintCount, src.active1.fields["name"])
 					src.printing = null
 
 	src.add_fingerprint(usr)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 80693df3f66..67ec9b4d1f9 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -387,10 +387,11 @@ What a mess.*/
 						while(active2.fields[text("com_[]", counter)])
 							P.info += text("[]<BR>", active2.fields[text("com_[]", counter)])
 							counter++
+						P.name = text("SR-[] '[]'", data_core.securityPrintCount, active1.fields["name"])
 					else
 						P.info += "<B>Security Record Lost!</B><BR>"
+						P.name = text("SR-[] '[]'", data_core.securityPrintCount, "Record Lost")
 					P.info += "</TT>"
-					P.name = text("SR-[] '[]'", data_core.securityPrintCount, active1.fields["name"])
 					printing = null
 //RECORD DELETE
 			if ("Delete All Records")
@@ -653,4 +654,4 @@ What a mess.*/
 
 /obj/machinery/computer/secure_data/detective_computer
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "messyfiles"
\ No newline at end of file
+	icon_state = "messyfiles"
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index cb18cc0c7a4..9cf9a792733 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -415,13 +415,41 @@ Code:
 				if(active3 in data_core.security)
 					menu += "Criminal Status: [active3.fields["criminal"]]<br>"
 
-					menu += "Minor Crimes: [active3.fields["mi_crim"]]<br>"
-					menu += "Details: [active3.fields["mi_crim"]]<br><br>"
+					menu += text("<BR>\nMinor Crimes:")
 
-					menu += "Major Crimes: [active3.fields["ma_crim"]]<br>"
-					menu += "Details: [active3.fields["ma_crim_d"]]<br><br>"
+					menu +={"<table style="text-align:center;" border="1" cellspacing="0" width="100%">
+<tr>
+<th>Crime</th>
+<th>Details</th>
+<th>Author</th>
+<th>Time Added</th>
+</tr>"}
+					for(var/datum/data/crime/c in active3.fields["mi_crim"])
+						menu += "<tr><td>[c.crimeName]</td>"
+						menu += "<td>[c.crimeDetails]</td>"
+						menu += "<td>[c.author]</td>"
+						menu += "<td>[c.time]</td>"
+						menu += "</tr>"
+					menu += "</table>"
 
-					menu += "Important Notes:<br>"
+					menu += text("<BR>\nMajor Crimes:")
+
+					menu +={"<table style="text-align:center;" border="1" cellspacing="0" width="100%">
+<tr>
+<th>Crime</th>
+<th>Details</th>
+<th>Author</th>
+<th>Time Added</th>
+</tr>"}
+					for(var/datum/data/crime/c in active3.fields["ma_crim"])
+						menu += "<tr><td>[c.crimeName]</td>"
+						menu += "<td>[c.crimeDetails]</td>"
+						menu += "<td>[c.author]</td>"
+						menu += "<td>[c.time]</td>"
+						menu += "</tr>"
+					menu += "</table>"
+
+					menu += "<BR>\nImportant Notes:<br>"
 					menu += "[active3.fields["notes"]]"
 				else
 					menu += "<b>Record Lost!</b><br>"