diff --git a/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm b/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm
index bf255c6c3781..cf651b1daa7c 100644
--- a/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm
+++ b/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm
@@ -1,6 +1,6 @@
 /obj/item/trench_ladder_kit
 	name = "sea ladder"
-	desc = "A deployable sea ladder that will allow you to descend to and ascend from the trench."
+	desc = "A deployable sea ladder that will allow you to descend to and ascend from the trench. Needs to be placed over a catwalk covered trench hole."
 
 	icon = 'goon/icons/obj/fluid.dmi'
 	icon_state = "ladder_off"
diff --git a/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm b/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm
index 7812b8afb1db..0ae75bb1b114 100644
--- a/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm
+++ b/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm
@@ -129,6 +129,7 @@ SUBSYSTEM_DEF(hotspots)
 			. = TRUE
 		else
 			listed_hotspot.can_drift = FALSE
+			generate_finalized_map()
 
 		///we handle movement and recentering here
 		listed_hotspot.drift_direction = angle2dir(arctan(hotspot_center.x - stomped.x, hotspot_center.y - stomped.y))
diff --git a/monkestation/code/modules/ocean_content/hotspot/trench_map.dm b/monkestation/code/modules/ocean_content/hotspot/trench_map.dm
index 0ab9e7a3beb9..792371c59720 100644
--- a/monkestation/code/modules/ocean_content/hotspot/trench_map.dm
+++ b/monkestation/code/modules/ocean_content/hotspot/trench_map.dm
@@ -107,15 +107,6 @@
 				</body>
 			</html>
 	"}
-
-/datum/controller/subsystem/hotspots/proc/show_map(client/shower)
-	if (!shower)
-		return
-	if (!finished_map || !map)
-		return
-	shower << browse_rsc(map, "trenchmap.png")
-	shower << browse(finished_map, "window=trench_map;size=560x610;title=Trench Map")
-
 /obj/item/sea_map
 	name = "Trench Map"
 	icon = 'icons/obj/contractor_tablet.dmi'
@@ -125,4 +116,19 @@
 	. = ..()
 	if(!user.client)
 		return
-	SShotspots.show_map(user.client)
+
+	if (!SShotspots.finished_map || !SShotspots.map)
+		return
+	ui_interact(user)
+
+/obj/item/sea_map/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "TrenchMap", name)
+		ui.open()
+
+
+/obj/item/sea_map/ui_data()
+	var/list/data = list()
+	data["map"] = SShotspots.finished_map
+	return data
diff --git a/monkestation/code/modules/ocean_content/hotspot_machines/stomper.dm b/monkestation/code/modules/ocean_content/hotspot_machines/stomper.dm
index d79d66b9bba7..63b8212a954e 100644
--- a/monkestation/code/modules/ocean_content/hotspot_machines/stomper.dm
+++ b/monkestation/code/modules/ocean_content/hotspot_machines/stomper.dm
@@ -137,7 +137,11 @@
 	for(var/datum/hotspot/listed_hotspot as anything in SShotspots.retrieve_hotspot_list(source_turf))
 		if(BOUNDS_DIST(src, listed_hotspot.center.return_turf()) > 2)///giving a 1 tile leeway on stomps
 			continue
-		say("Hotspot Pinned")
+		if(!listed_hotspot.can_drift)
+			say("Hotspot Pinned!")
+		else
+			say("Hotspot Released!")
+
 	playsound(src, 'goon/sounds/impact_sounds/Metal_Hit_Lowfi_1.ogg', 50, 1)
 
 	for(var/mob/any_mob in viewers(src))
diff --git a/tgui/packages/tgui/interfaces/TrenchMap.tsx b/tgui/packages/tgui/interfaces/TrenchMap.tsx
new file mode 100644
index 000000000000..9433c30670b1
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/TrenchMap.tsx
@@ -0,0 +1,16 @@
+import { Window } from '../layouts';
+import { useBackend } from '../backend';
+import { Box } from '../components';
+
+export const TrenchMap = (props, context) => {
+  const { act, data } = useBackend(context);
+  const { map } = data;
+  const textHtml = {
+    __html: map,
+  };
+  return (
+    <Window width={560} height={610}>
+      <Box dangerouslySetInnerHTML={textHtml} />
+    </Window>
+  );
+};