diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 35cf2d31425..a9b3d49b486 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -365,8 +365,7 @@ var/list/mechtoys = list(
 	return attack_hand(user)
 
 /obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob)
-	ui_interact(usr)
-	return
+	ui_interact(user)
 
 /obj/machinery/computer/ordercomp/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
 	// data to send to ui
@@ -424,7 +423,7 @@ var/list/mechtoys = list(
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
 	if(!ui)
-		ui = new(user, src, ui_key, "order_console.tmpl", name, COMP_SCREEN_WIDTH, COMP_SCREEN_HEIGHT)
+		ui = new(user, src, ui_key, "order_console.tmpl", name, COMP_SCREEN_WIDTH+10, COMP_SCREEN_HEIGHT) //plus 10 because the default is *just* small enough to cause ugly wrapping effects
 		ui.set_initial_data(data)
 		ui.open()
 
@@ -596,7 +595,7 @@ var/list/mechtoys = list(
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
 	if(!ui)
-		ui = new(user, src, ui_key, "supply_console.tmpl", name, COMP_SCREEN_WIDTH, COMP_SCREEN_HEIGHT)
+		ui = new(user, src, ui_key, "supply_console.tmpl", name, COMP_SCREEN_WIDTH+10, COMP_SCREEN_HEIGHT) //plus 10 because the default is *just* small enough to cause ugly wrapping effects
 		ui.set_initial_data(data)
 		ui.open()
 
diff --git a/nano/css/shared.css b/nano/css/shared.css
index bc6b3872ec0..4751c06a79e 100644
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -298,7 +298,7 @@ div.notice {
     border: 1px solid #40628a;
     padding: 4px;
     margin: 3px 0;
-	overflow: hidden;
+    overflow: hidden;
 }
 
 .statusDisplayRecords {
diff --git a/nano/js/nano_state.js b/nano/js/nano_state.js
index 198fa451246..3e9ef3ab1ff 100644
--- a/nano/js/nano_state.js
+++ b/nano/js/nano_state.js
@@ -63,9 +63,7 @@ NanoStateClass.prototype.onUpdate = function (data) {
             if (!this.mapInitialised)
             {
                 // Add drag functionality to the map ui
-                $('#uiMap').draggable({
-                    handle : '#uiMapImage'
-                });
+                $('#uiMap').draggable();
 
                 $('#uiMapTooltip')
                     .off('click')
diff --git a/nano/templates/supply_console.tmpl b/nano/templates/supply_console.tmpl
index 50f736e5ba8..f6328a8d422 100644
--- a/nano/templates/supply_console.tmpl
+++ b/nano/templates/supply_console.tmpl
@@ -55,7 +55,7 @@ Used In File(s): \code\game\supplyshuttle.dm
 	<div class="itemLabel">
 		Supply Crates
 	</div>
-	<div class="itemContentWide" style="width: 95%;">
+	<div class="itemContentWide" style="width: 100%;">
 		<div class="statusDisplay">
 			<div class="line" style="overflow-y: auto; overflow-x: hidden; scrollbar-base-color: #336699; scrollbar-arrow-color: #ffffff; height: 184px">
 				{{if !data.contents}}