diff --git a/nano/layouts/layout_default.tmpl b/nano/layouts/layout_default.tmpl
index c0832fb6803..812b974a1ab 100644
--- a/nano/layouts/layout_default.tmpl
+++ b/nano/layouts/layout_default.tmpl
@@ -57,13 +57,15 @@
 		</div>
 	</div>
 	<div style="float: right">
-		<table><tr>
-			<td>{{:helper.link('Shutdown', null, {'action' : 'PC_shutdown'})}}
-			{{if data.PC_showexitprogram}}
-				<td>{{:helper.link('EXIT PROGRAM', null, {'action' : 'PC_exit'})}}
-					<td>{{:helper.link('Minimize Program', null, {'action' : 'PC_minimize'})}}
-			{{/if}}
-		</table>
+		<div class='item'>
+			<table><tr>
+				<td>{{:helper.link('Shutdown', 'power-off', {'action' : 'PC_shutdown'})}}
+				{{if data.PC_showexitprogram}}
+					<td>{{:helper.link('EXIT PROGRAM', 'times', {'action' : 'PC_exit'})}}
+						<td>{{:helper.link('Minimize Program', 'minus', {'action' : 'PC_minimize'})}}
+				{{/if}}
+			</table>
+		</div>
 	</div>
 	<div style="clear: both">
 {{/if}}
diff --git a/nano/templates/ai_restorer.tmpl b/nano/templates/ai_restorer.tmpl
index bfb23901e19..eb4c20a74f8 100644
--- a/nano/templates/ai_restorer.tmpl
+++ b/nano/templates/ai_restorer.tmpl
@@ -22,7 +22,7 @@
 		</div>
 		<div class="item">
 			<div class="itemLabel">System Integrity:</div>
-			{{:helper.displayBar(data.health, 0, 100, (data.health > 75) ? 'good' : (health > 50) ? 'average' : 'bad')}}
+			{{:helper.displayBar(data.health, 0, 100, (data.health > 75) ? 'good' : (data.health > 50) ? 'average' : 'bad')}}
 			<div class="itemContent" style="width: 60px">
 				{{:helper.smoothRound(data.health)}}%
 			</div>	
diff --git a/nano/templates/ntnet_dos.tmpl b/nano/templates/ntnet_dos.tmpl
index db92c2e84b7..bff7bb3b9f0 100644
--- a/nano/templates/ntnet_dos.tmpl
+++ b/nano/templates/ntnet_dos.tmpl
@@ -6,7 +6,7 @@
 	{{for data.dos_strings}}
 		{{:value.nums}}<br>
 	{{/for}}
-	{{:helper.link('ABORT', null, {'action' : 'PRG_reset'})}}
+	{{:helper.link('ABORT', 'ban', {'action' : 'PRG_reset'})}}
 {{else}}
 	##DoS traffic generator ready. Select target device.<br>
 	<div class='item'>
@@ -14,7 +14,7 @@
 		<div class="itemContent">{{if data.focus}}{{:data.focus}}{{else}}None{{/if}}</div>
 	</div>
 	<div class='item'>
-		{{:helper.link('EXECUTE', null, {'action' : 'PRG_execute'})}}<div style="clear:both"></div>
+		{{:helper.link('EXECUTE', 'play', {'action' : 'PRG_execute'})}}<div style="clear:both"></div>
 	</div>
 	Detected devices on network:<br>
 	<table>
diff --git a/nano/templates/ntnet_monitor.tmpl b/nano/templates/ntnet_monitor.tmpl
index c5b66e1102e..319baa872f0 100644
--- a/nano/templates/ntnet_monitor.tmpl
+++ b/nano/templates/ntnet_monitor.tmpl
@@ -7,18 +7,22 @@
 		<b>{{:data.ntnetrelays}}</b>
 	</div>
 	{{if data.ntnetrelays}}
-		<div class="itemLabelWide">
-			System status:
+		<div class='item'>
+			<div class="itemLabelWide">
+				System status:
+			</div>
+			<div class="itemContentNarrow">
+				<b>{{:data.ntnetstatus ? "ENABLED" : "DISABLED"}}</b>
+			</div>
 		</div>
-		<div class="itemContentNarrow">
-			<b>{{:data.ntnetstatus ? "ENABLED" : "DISABLED"}}</b>
-		</div>		
-		<div class="itemLabelWide">
-			Control:
+		<div class='item'>
+			<div class="itemLabelWide">
+				Control:
+			</div>
+			<div class="itemContentNarrow">
+				{{:helper.link('TOGGLE', null, {'action' : 'toggleWireless'})}}
+			</div>
 		</div>
-		<div class="itemContentNarrow">
-			{{:helper.link('TOGGLE', null, {'action' : 'toggleWireless'})}}
-		</div><br><br>
 		<i>Caution - Disabling wireless transmitters when using wireless device may prevent you from re-enabling them again!</i>
 	{{else}}
 		<br><p>Wireless coverage unavailable, no relays are connected.</p>
@@ -27,7 +31,7 @@
 
 <h1>FIREWALL CONFIGURATION</h1>
 <div class="statusDisplay" style="overflow: auto;">
-	<table>
+	<table style='width: 100%;'>
 		<tr>
 			<th>PROTOCOL</th>
 			<th>STATUS</th>
@@ -35,23 +39,23 @@
 		</tr>
 		<tr>
 			<td>Software Downloads</td>
-			<td>{{:data.config_softwaredownload ? 'ENABLED' : 'DISABLED'}}</td>
-			<td>{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 1})}}</td>
+			<td><center>{{:data.config_softwaredownload ? 'ENABLED' : 'DISABLED'}}</td>
+			<td><div style="text-align: center;"><div style="display: inline-block;">{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 1})}}</div></div></td>
 		</tr>
 		<tr>
 			<td>Peer to Peer Traffic</td>
-			<td>{{:data.config_peertopeer ? 'ENABLED' : 'DISABLED'}}</td>
-			<td>{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 2})}}</td>
+			<td><center>{{:data.config_peertopeer ? 'ENABLED' : 'DISABLED'}}</td>
+			<td><div style="text-align: center;"><div style="display: inline-block;">{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 2})}}</div></div></td>
 		</tr>
 		<tr>
 			<td>Communication Systems</td>
-			<td>{{:data.config_communication ? 'ENABLED' : 'DISABLED'}}</td>
-			<td>{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 3})}}</td>
+			<td><center>{{:data.config_communication ? 'ENABLED' : 'DISABLED'}}</td>
+			<td><div style="text-align: center;"><div style="display: inline-block;">{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 3})}}</div></div></td>
 		</tr>
 		<tr>
 			<td>Remote System Control</td>
-			<td>{{:data.config_systemcontrol ? 'ENABLED' : 'DISABLED'}}</td>
-			<td>{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 4})}}</td>
+			<td><center>{{:data.config_systemcontrol ? 'ENABLED' : 'DISABLED'}}</td>
+			<td><div style="text-align: center;"><div style="display: inline-block;">{{:helper.link('TOGGLE', null, {'action' : 'toggle_function', 'id' : 4})}}</div></div></td>
 		</tr>
 	</table>
 </div>