diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 72f83153687..6f019350217 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -174,7 +174,7 @@
 	*/
 
 /obj/docking_port/stationary/transit
-	name = "In Transit"
+	name = "In transit"
 	turf_type = /turf/space/transit
 
 	lock_shuttle_doors = 1
@@ -183,7 +183,7 @@
 	if(!..())
 		return 0
 
-	name = "In Transit" //This looks weird, but- it means that the on-map instances can be named something actually usable to search for, but still appear correctly in terminals.
+	name = "In transit" //This looks weird, but- it means that the on-map instances can be named something actually usable to search for, but still appear correctly in terminals.
 
 	shuttle_master.transit += src
 	return 1
@@ -702,6 +702,7 @@
 			if(!M.check_dock(S))
 				continue
 			docking_ports[++docking_ports.len] = list("name" = S.name, "id" = S.id)
+		data["docking_ports_len"] = docking_ports.len
 		data["admin_controlled"] = admin_controlled
 		data["docking_request"] = docking_request
 
diff --git a/nano/templates/shuttle_console.tmpl b/nano/templates/shuttle_console.tmpl
index 2b16495d522..d16f39a8b20 100644
--- a/nano/templates/shuttle_console.tmpl
+++ b/nano/templates/shuttle_console.tmpl
@@ -3,26 +3,35 @@ Title: Shuttle Console
 Used In File(s): /code/modules/shuttle/shuttle.dm
 -->
 
-<div style="text-align: center;">
-	<div class='line'><b>Status:</b> {{:data.status ? data.status : '<span class="bad">*Missing*</span>'}}</div>
-	{{if data.shuttle}}
-		{{for data.docking_ports}}
-			<div style="display: inline-block;">
-				<div class='item'>{{:helper.link('Send to ' + value.name, 'sign-out', {'move' : value.id})}}</div>
-			</div>
-		{{empty}}
-			<h4 class='bad'>Shuttle Locked</h4>
-			{{if data.admin_controlled}}
-				<div class='line'><b class='average'>Authorized personnel only</b></div>
-				<div style="display: inline-block;">
-					<div class='item'>{{:helper.link('Request Authorization', 'share-square-o', {'request' : 1})}}</div>
+<div class='item'>
+	<div class='itemLabel'>Location:</div>
+	<div class='itemContent'>{{:data.status ? data.status : '<span class="bad">*Missing*</span>'}}</div>
+</div>
+{{if data.shuttle}}
+	{{if data.docking_ports_len}}
+		<hr>
+		<div class='item'>
+			{{for data.docking_ports}}
+				<div class='line'>{{:helper.link('Send to ' + value.name, 'sign-out', {'move' : value.id})}}</div>
+			{{/for}}
+		</div>
+	{{else}}
+		<div class='item'>
+			<div class='itemLabel'>Status:</div>
+			<div class='itemContent bad'>Shuttle locked
+		{{if data.admin_controlled}}
+				<span>, authorized personnel only</span>
+			</div></div>
+			<hr>
+			<div class='item'>{{:helper.link('Request authorization', 'share-square-o', {'request' : 1})}}</div>
+		{{else}}
 				</div>
-			{{/if}}
-		{{/for}}
-		{{if data.docking_request}}
-			<div style="display: inline-block;">
-				<div class='item'>{{:helper.link('Request docking at NSS Cyberiad', 'share-square-o', {'request' : 1})}}</div>
 			</div>
+			<hr>
 		{{/if}}
 	{{/if}}
-</div>
\ No newline at end of file
+	
+	{{if data.docking_request}}
+		<div class='line'>{{:helper.link('Request docking at NSS Cyberiad', 'share-square-o', {'request' : 1})}}</div>
+	{{/if}}
+{{/if}}
\ No newline at end of file