diff --git a/app/api/UpdaterApi.php b/app/api/UpdaterApi.php
deleted file mode 100644
index 8bdf753..0000000
--- a/app/api/UpdaterApi.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-class UpdatesApi {
-    private function sendFile($path)	{
-        header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK', true, 200);
-        header('Content-Type: application/octet-stream', true);
-        header('Content-Disposition: attachment; filename=' . basename($path));
-        header('Content-Length: ' . filesize($path), true);
-        header('x-MD5: ' . md5_file($path), true);
-        readfile($path);
-    }
-
-    public function default(){
-		 header('Content-type: text/plain; charset=utf8', true);
-        $logManager = new LogManager('../logs/ota/'. date("Y-m-d").'.log');
-        $logManager->setLevel(LOGLEVEL);
-
-        //Filtrování IP adress
-       	/* if (DEBUGMOD != 1) {
-            if (!in_array($_SERVER['REMOTE_ADDR'], HOMEIP)) {
-                echo json_encode(array(
-                    'state' => 'unsuccess',
-                    'errorMSG' => "Using API from your IP insnt alowed!",
-                ));
-                header($_SERVER["SERVER_PROTOCOL"]." 401 Unauthorized");
-                $logManager->write("[Updater] acces denied from " . $_SERVER['REMOTE_ADDR'], LogRecordTypes::WARNING);
-                exit();
-            }
-        }*/
-
-        $macAddress = $_SERVER['HTTP_X_ESP8266_STA_MAC'];
-		  $localBinary = "../updater/" . str_replace(':', '', $macAddress) . ".bin";
-
-        $logManager->write("[Updater] url: " . $localBinary, LogRecordTypes::INFO);
-        $logManager->write("[Updater] version: " . $_SERVER['HTTP_X_ESP8266_SKETCH_MD5'], LogRecordTypes::INFO);
-        if (file_exists($localBinary)) {
-            $logManager->write("[Updater] version PHP: \n" . md5_file($localBinary), LogRecordTypes::INFO);
-            if ($_SERVER['HTTP_X_ESP8266_SKETCH_MD5'] != md5_file($localBinary)) {
-                $this->sendFile($localBinary);
-                //get device data
-                $device = DeviceManager::getDeviceByMac($macAddress);
-                $deviceName = $device['name'];
-                $deviceId = $device['device_id'];
-                //logfile write
-                $logManager->write("[Device] device_ID " . $deviceId . " was just updated to new version", LogRecordTypes::WARNING);
-                $logManager->write("[Device] version hash: \n" . md5_file($localBinary), LogRecordTypes::INFO);
-                //notification
-                $notificationMng = new NotificationManager;
-                $notificationData = [
-                    'title' => 'Info',
-                    'body' => $deviceName.' was just updated to new version',
-                    'icon' => BASEDIR . '/app/templates/images/icon-192x192.png',
-                ];
-                if ($notificationData != []) {
-                    $subscribers = $notificationMng->getSubscription();
-                    foreach ($subscribers as $key => $subscriber) {
-                        $logManager->write("[NOTIFICATION] SENDING TO " . $subscriber['id'] . " ", LogRecordTypes::INFO);
-                        $answer = $notificationMng->sendSimpleNotification(SERVERKEY, $subscriber['token'], $notificationData);
-                    }
-                }
-            } else {
-                header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified', true, 304);
-            }
-        } else {
-            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-        }
-        die();
-    }
-}
diff --git a/app/api/UpdatesApi.php b/app/api/UpdatesApi.php
index f44f4dd..11d9933 100644
--- a/app/api/UpdatesApi.php
+++ b/app/api/UpdatesApi.php
@@ -24,6 +24,11 @@ class UpdatesApi {
         $logManager->setLevel(LOGLEVEL);
         $logManager->write("[Updater] Client Connected", LogRecordTypes::INFO);
         
+        if($this->validateHeader($_SERVER)){
+            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+            die();
+        }
+
         header('Content-type: text/plain; charset=utf8', true);
         
         //Filtrování IP adress
diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml
index a0e5685..cccdecd 100644
--- a/app/views/templates/device.phtml
+++ b/app/views/templates/device.phtml
@@ -1,5 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5cb6f0b... Some Fixes
 <head>
 	<?php
 	$partial = new Partial('head');
@@ -8,6 +12,10 @@
 	?>
 	<title><?php echo $TITLE ?></title>
 </head>
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5cb6f0b... Some Fixes
 <body class="no-transitions">
 	<div class="row no-gutters main">
 		<div class="col-md-3 d-sm-none"></div>
@@ -15,8 +23,8 @@
 			<?php
 			$partial = new Partial('menu');
 			$partial->prepare('item', 'device');
-			$partial->prepare('langMng',$LANGMNG);
-			$partial->prepare('debugMod',$DEBUGMOD);
+			$partial->prepare('langMng', $LANGMNG);
+			$partial->prepare('debugMod', $DEBUGMOD);
 			$partial->render();
 			?>
 		</div>
@@ -26,41 +34,40 @@
 					<tr>
 						<th>#</th>
 						<th>Name</th>
+						<th>Room</th>
 						<th>Firmware</th>
-						<th>Mac</th>
-						<th>IP Address</th>
+						<th>IP Address<br>(Mac)</th>
 						<th>Action</th>
 					</tr>
 				</thead>
 				<tbody>
-					<?php if (!empty ($DEVICES)): ?>
-						<?php foreach ($DEVICES as $device): ?>
+					<?php if (!empty($DEVICES)) : ?>
+						<?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><i class="fa">&#x<?php echo (!empty($device['icon']) ? $device['icon'] : ""); ?></i></td>
+								<td><?php echo (!empty($device['name']) ? $device['name'] : ""); ?></td>
+								<td>Room</td>
 								<td>
-									<?php if (!empty ($device['mac'])): ?>
-										<i
-											class="fa <?php echo (!empty ($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "fa-check-circle" : "fa-circle") : "fa-times-circle"); ?>"
-											style="float: center; <?php echo (!empty ($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "color: green;" : "color: yellow;") : "color: red;"); ?>"
-										></i>
-										<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware').click();" >&#xf0ee;</button>
+									<?php if (!empty($device['mac'])) : ?>
+										<i class="fa <?php echo (!empty($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "fa-check-circle" : "fa-circle") : "fa-times-circle"); ?>" style="float: center; <?php echo (!empty($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "color: green;" : "color: yellow;") : "color: red;"); ?>"></i>
+										<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware').click();">&#xf0ee;</button>
 										<form style="display: none;" method="post" action="" enctype="multipart/form-data">
-											<input type="hidden" name="deviceId" value="<?php echo (!empty ($device['device_id']) ? $device['device_id'] : ""); ?>">
+											<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
 											<input type="file" onchange="this.form.submit();" name="deviceFirmware" id="deviceFirmware" value="">
 										</form>
 									<?php endif; ?>
 									<div type="float: clear;"></div>
 								</td>
-								<td><?php echo (!empty ($device['mac']) ? $device['mac'] : ""); ?></td>
-								<td><?php echo (!empty ($device['ip_address']) ? $device['ip_address'] : ""); ?></td>
+								<td><?php echo (!empty($device['mac']) ? $device['mac'] : ""); ?><br><?php echo (!empty($device['ip_address']) ? $device['ip_address'] : ""); ?></td>
 								<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" <?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>
+									<?php if (!empty($device['mac'])) : ?>
+										<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" <?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>
+									<?php endif; ?>
 								</td>
 							</tr>
 						<?php endforeach; ?>
@@ -69,11 +76,12 @@
 			</table>
 		</div>
 
-			<?php
-			$partial = new Partial('footer');
-			$partial->prepare('baseDir', BASEDIR);
-			$partial->render();
-			//TODO js do main.js
-			?>
-	</body>
+		<?php
+		$partial = new Partial('footer');
+		$partial->prepare('baseDir', BASEDIR);
+		$partial->render();
+		//TODO js do main.js
+		?>
+</body>
+
 </html>