diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 96168111efb2..b9c0f9ad1003 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -6992,8 +6992,9 @@
 "auQ" = (
 /obj/structure/barricade/handrail{
 	dir = 1;
-	pixel_y = 8;
-	plane = -4
+	pixel_y = 1;
+	plane = -4;
+	layer = 4
 	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
@@ -7637,13 +7638,15 @@
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/living/numbertwobunks)
 "awG" = (
-/obj/structure/platform,
 /obj/structure/prop/almayer/computers/sensor_computer2{
 	layer = 2.5
 	},
 /obj/structure/machinery/light{
 	dir = 4
 	},
+/obj/structure/platform{
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	dir = 6;
 	icon_state = "silver"
@@ -8203,14 +8206,15 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/aft_hallway)
 "ayI" = (
-/obj/structure/barricade/handrail{
-	dir = 1;
-	pixel_y = 8;
-	plane = -4
-	},
 /obj/structure/machinery/status_display{
 	pixel_x = 32
 	},
+/obj/structure/barricade/handrail{
+	dir = 1;
+	pixel_y = 1;
+	plane = -4;
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
 	},
@@ -35149,13 +35153,15 @@
 	},
 /area/almayer/shipboard/brig/processing)
 "eVj" = (
-/obj/structure/platform,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
 /obj/structure/machinery/disposal{
 	layer = 2.8
 	},
+/obj/structure/platform{
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "silver"
 	},
@@ -40569,7 +40575,9 @@
 	},
 /area/almayer/squads/delta)
 "hge" = (
-/obj/structure/platform,
+/obj/structure/platform{
+	layer = 4
+	},
 /obj/structure/surface/table/reinforced/black,
 /obj/structure/machinery/prop/almayer/CICmap{
 	pixel_y = 8;
@@ -47221,10 +47229,12 @@
 	},
 /area/almayer/hallways/vehiclehangar)
 "jXp" = (
-/obj/structure/platform,
 /obj/structure/surface/table/reinforced/black,
 /obj/effect/landmark/map_item,
 /obj/effect/landmark/map_item,
+/obj/structure/platform{
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "silver"
 	},
@@ -48740,10 +48750,12 @@
 	},
 /area/almayer/shipboard/brig/processing)
 "kDK" = (
-/obj/structure/platform,
 /obj/structure/machinery/photocopier{
 	layer = 2.8
 	},
+/obj/structure/platform{
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "silver"
 	},
@@ -49871,7 +49883,6 @@
 	},
 /area/almayer/squads/charlie)
 "lbp" = (
-/obj/structure/platform,
 /obj/structure/surface/table/reinforced/black,
 /obj/item/tool/stamp{
 	pixel_x = 6;
@@ -49894,6 +49905,9 @@
 	pixel_y = 7;
 	pixel_x = -3
 	},
+/obj/structure/platform{
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "silver"
 	},
@@ -50560,12 +50574,14 @@
 	},
 /area/almayer/living/grunt_rnr)
 "lpa" = (
-/obj/structure/platform,
 /obj/structure/surface/table/reinforced/black,
 /obj/structure/machinery/faxmachine/uscm/command{
 	pixel_y = 4;
 	pixel_x = 2
 	},
+/obj/structure/platform{
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "silver"
 	},
@@ -53275,14 +53291,15 @@
 	},
 /area/almayer/medical/lower_medical_lobby)
 "mwo" = (
-/obj/structure/barricade/handrail{
-	dir = 1;
-	pixel_y = 8;
-	plane = -4
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/barricade/handrail{
+	dir = 1;
+	pixel_y = 1;
+	plane = -4;
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
 	},
@@ -59710,15 +59727,16 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
 	},
-/obj/structure/barricade/handrail{
-	dir = 1;
-	pixel_y = 8;
-	plane = -4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/structure/barricade/handrail{
+	dir = 1;
+	pixel_y = 1;
+	plane = -4;
+	layer = 4
+	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/command/cic)
 "pcO" = (
@@ -62439,8 +62457,9 @@
 	},
 /obj/structure/barricade/handrail{
 	dir = 1;
-	pixel_y = 8;
-	plane = -4
+	pixel_y = 1;
+	plane = -4;
+	layer = 4
 	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
@@ -68139,7 +68158,6 @@
 	},
 /area/almayer/living/grunt_rnr)
 "sEp" = (
-/obj/structure/platform,
 /obj/structure/machinery/light{
 	dir = 8
 	},
@@ -68156,6 +68174,9 @@
 /obj/item/device/toner{
 	plane = -4
 	},
+/obj/structure/platform{
+	layer = 4
+	},
 /turf/open/floor/almayer{
 	dir = 10;
 	icon_state = "silver"
@@ -80888,14 +80909,15 @@
 	},
 /area/almayer/command/cic)
 "xBH" = (
-/obj/structure/barricade/handrail{
-	dir = 1;
-	pixel_y = 8;
-	plane = -4
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/barricade/handrail{
+	dir = 1;
+	pixel_y = 1;
+	plane = -4;
+	layer = 4
+	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/command/cic)
 "xBQ" = (