diff --git a/app/controllers/deviceController.php b/app/controllers/deviceController.php
index bc367f3..0958618 100644
--- a/app/controllers/deviceController.php
+++ b/app/controllers/deviceController.php
@@ -24,6 +24,9 @@ if (!empty ($_POST)){
 	if (!empty ($_POST['deviceRoomId'])  && !empty ($_POST['deviceId'])) {
 		$deviceManager->edit ($_POST['deviceId'], array ('room_id' => $_POST['deviceRoomId']));
 	}
+	if (!empty ($_POST['deviceName'])  && !empty ($_POST['deviceId'])) {
+		$deviceManager->edit ($_POST['deviceId'], array ('name' => $_POST['deviceName']));
+	}
 	header('Location: ./device');
 	die();
 }
diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml
index b0396ca..db37436 100644
--- a/app/views/templates/device.phtml
+++ b/app/views/templates/device.phtml
@@ -42,9 +42,14 @@
 						<?php foreach ($DEVICES as $device) : ?>
 							<tr>
 								<td><i class="fa">&#x<?php echo (!empty($device['icon']) ? $device['icon'] : ""); ?></i></td>
-								<td><?php echo (!empty($device['name']) ? $device['name'] : ""); ?></td>
 								<td>
-								<form method="post" action="" enctype="multipart/form-data">
+									<form method="post" action="">
+										<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
+										<input class="input" type="text" onchange="this.form.submit();" name="deviceName" value="<?php echo (!empty($device['name']) ? $device['name'] : ""); ?>">
+									</form>
+								</td>
+								<td>
+								<form method="post" action="">
 									<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
 									<select class="input" name="deviceRoomId" onchange="this.form.submit();">
 									<?php
@@ -60,22 +65,23 @@
 								<td>
 									<?php if (!empty($device['mac'])) : ?>
 										<?php
-										$icon = "fa-circle";
-										$color = "yellow";
-										if (!empty($device['firmware_hash'])) {
-											if ($device['firmware_hash'] == "true") {
-												$icon = "fa-check-circle";
-												$color = "green";
-											} else if ($device['firmware_hash'] == "need") {
-												$icon = "arrow-circle-up";
-											} else {
-												$icon = "fa-times-circle";
-												$color = "red";
+											$icon = "fa-circle";
+											$color = "yellow";
+											if (!empty($device['firmware_hash'])) {
+												if ($device['firmware_hash'] == "true") {
+													$icon = "fa-check-circle";
+													$color = "green";
+												} else if ($device['firmware_hash'] == "need") {
+													$icon = "fa-arrow-circle-up";
+													$color = "#6495ED";
+												} else {
+													$icon = "fa-times-circle";
+													$color = "red";
+												}
 											}
-										}
 										?>
 
-										<i class="fa <?php echo $icon; ?>" style="color: <?php echo $color; ?>"></i>
+										<i class="fa <?php echo $icon; ?>" style="color: <?php echo $color; ?>;"></i>
 										<?php echo $device['firmware_hash'] ?>
 										<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php echo $device['device_id']?>').click();">&#xf0ee;</button>
 										<form style="display: none;" method="post" action="" enctype="multipart/form-data">