diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm
index ec9443c54b3..aea86079650 100644
--- a/_maps/map_files/cyberiad/z2.dmm
+++ b/_maps/map_files/cyberiad/z2.dmm
@@ -802,7 +802,7 @@
 "pv" = (/obj/machinery/computer/med_data,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
 "pw" = (/obj/machinery/door/airlock/external{id_tag = "specops_away"; name = "Shuttle Hatch"; req_access_txt = "109"},/turf/space,/area/centcom/control)
 "px" = (/obj/machinery/door/airlock/external{id_tag = "specops_away"; name = "Shuttle Hatch"; req_access_txt = "109"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
-"py" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency/backup,/turf/space,/area/shuttle/escape)
+"py" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency/backup,/obj/docking_port/stationary{dir = 4; dwidth = 2; height = 8; id = "backup_away"; name = "Backup shuttle Dock"; width = 8},/turf/space,/area/shuttle/escape)
 "pz" = (/obj/structure/toilet{dir = 4},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops)
 "pA" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops)
 "pB" = (/obj/effect/decal/cleanable/vomit{name = "urine"},/obj/machinery/camera{c_tag = "CentComm Special Ops. Bathroom"; dir = 2; network = list("ERT","CentComm")},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index aee786279ab..c45258be1d7 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -267,16 +267,10 @@
 	if(height-dheight > S.height-S.dheight)
 		return 5
 	//check the dock isn't occupied
-	var/currently_docked = S.get_docked()
 	// by someone other than us
-	if(currently_docked != src)
+	if(S.get_docked())
 		return 6
-	else
-	// This isn't an error, per se, but we can't let the shuttle code
-	// attempt to move us where we currently are, it will get weird.
-		return SHUTTLE_ALREADY_DOCKED
-	return 0	//0 means we can dock
-
+	return 0
 //call the shuttle to destination S
 /obj/docking_port/mobile/proc/request(obj/docking_port/stationary/S)
 	var/status = canDock(S)
diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm
index be4d9fc7f92..5d0bb7ac20a 100644
--- a/code/modules/shuttle/shuttle_manipulator.dm
+++ b/code/modules/shuttle/shuttle_manipulator.dm
@@ -85,9 +85,9 @@
 
 	var/dat = ""
 	dat += "<center>"
-	dat += "<a href='?_src_=prefs;preference=tab;tab=[SHUTTLE_MANIPULATOR_STATUS]' [current_tab == SHUTTLE_MANIPULATOR_STATUS ? "class='linkOn'" : ""]>Status</a>"
-	dat += "<a href='?_src_=prefs;preference=tab;tab=[SHUTTLE_MANIPULATOR_TEMPLATE]' [current_tab == SHUTTLE_MANIPULATOR_TEMPLATE ? "class='linkOn'" : ""]>Templates</a>"
-	dat += "<a href='?_src_=prefs;preference=tab;tab=[SHUTTLE_MANIPULATOR_MOD]' [current_tab == SHUTTLE_MANIPULATOR_MOD ? "class='linkOn'" : ""]>Modification</a>"
+	dat += "<a href='?src=\ref[src];[src]=tab;tab=[SHUTTLE_MANIPULATOR_STATUS]' [current_tab == SHUTTLE_MANIPULATOR_STATUS ? "class='linkOn'" : ""]>Status</a>"
+	dat += "<a href='?src=\ref[src];[src]=tab;tab=[SHUTTLE_MANIPULATOR_TEMPLATE]' [current_tab == SHUTTLE_MANIPULATOR_TEMPLATE ? "class='linkOn'" : ""]>Templates</a>"
+	dat += "<a href='?src=\ref[src];[src]=tab;tab=[SHUTTLE_MANIPULATOR_MOD]' [current_tab == SHUTTLE_MANIPULATOR_MOD ? "class='linkOn'" : ""]>Modification</a>"
 	dat += "</center>"
 	dat += "<HR>"
 
@@ -102,8 +102,8 @@
 				for(var/list/shuttle in shuttle_data["shuttles"])
 					dat += "<span class='line'>"
 					dat += "<span class='statusLabel'>[shuttle["name"]] [shuttle["id"]]: [shuttle["mode"]] [shuttle["status"]] [shuttle["timer"]] </span>"
-					dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a><br>"
-					dat += "</span>"
+					dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a>"
+					dat += "<br></span>"
 				dat += "</div>"
 			if(SHUTTLE_MANIPULATOR_TEMPLATE)
 				dat += "<div class='block'>"
@@ -112,8 +112,8 @@
 					dat += "<span class='statusLabel'> [shuttle["name"]] <br>[shuttle["description"]]<br> [shuttle["admin_notes"]] <br></span>"
 					dat += "<A href='?src=\ref[src];load=[shuttle["id"]]'>Load Template</A>"
 					dat += "<A href='?src=\ref[src];select_template=[shuttle["id"]]'>Select Template</A>"
-					dat += "<a href='?src=\ref[src];preview=[shuttle["id"]]'>Preview Template</a><br>"
-					dat += "</span>"
+					dat += "<a href='?src=\ref[src];preview=[shuttle["id"]]'>Preview Template</A>"
+					dat += "<br></span>"
 				dat += "</div>"
 			if(SHUTTLE_MANIPULATOR_MOD)
 				dat += "<div class='block'>"
@@ -121,8 +121,8 @@
 					dat += "<span class='line'>"
 					dat += "<span class='statusLabel'>[shuttle["name"]] [shuttle["id"]] <br>[shuttle["description"]]<br> [shuttle["admin_notes"]] <br> </span>"
 					dat += "<A href='?src=\ref[src];move=[shuttle["id"]]'>Send to port</A>"
-					dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a><br>"
-					dat += "</span>"
+					dat += "<a href='?src=\ref[src];jump_to=[shuttle["id"]]'>Jump To</a>
+					dat += "<br></span>"
 				dat += "</div>"
 
 	var/datum/browser/popup = new(user, "shuttle manipulator", "Shuttle Manipulator", 500, 500)