diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml
index bdc5a9c..a0e5685 100644
--- a/app/views/templates/device.phtml
+++ b/app/views/templates/device.phtml
@@ -21,10 +21,10 @@
 			?>
 		</div>
 		<div class="col-md-9 main-body">
-			<table>
+			<table class="table is-fluid">
 				<thead>
 					<tr>
-						<th>Icon</th>
+						<th>#</th>
 						<th>Name</th>
 						<th>Firmware</th>
 						<th>Mac</th>
@@ -57,8 +57,8 @@
 								<td>
 									<form method="post" action="">
 										<input type="hidden" name="deviceId" value="<?php echo (!empty ($device['device_id']) ? $device['device_id'] : ""); ?>">
-										<button class="fa custom-file-input" type="submit" name="deviceCommand" value="reset" title="Reset">&#xf01e;</button>
-										<button class="fa custom-file-input" type="submit" name="deviceCommand" value="config" title="Config">&#xf013;</button>
+										<button class="fa custom-file-input" <?php echo (!empty ($device['command']) && $device['command'] == "reset" ? "style=\"color:red;\"" : ""); ?> type="submit" name="deviceCommand" value="reset" title="Reset">&#xf01e;</button>
+										<button class="fa custom-file-input" <?php echo (!empty ($device['command']) && $device['command'] == "config" ? "style=\"color:red;\"" : ""); ?> type="submit" name="deviceCommand" value="config" title="Config">&#xf013;</button>
 										<div style="float: clear;"></div>
 									</form>
 								</td>