diff --git a/app/controls/automation.php b/app/controls/automation.php
index 94432bb..b23dc4c 100644
--- a/app/controls/automation.php
+++ b/app/controls/automation.php
@@ -8,7 +8,7 @@ if (isset($_POST) && !empty($_POST)){
 		], JSON_PRETTY_PRINT);
 		$onDays = $_POST['atDays'];
 
-		AutomationManager::create('name', $onDays, $doCode, $ifCode);
+		AutomationManager::create($_POST['name'], $onDays, $doCode, $ifCode);
 
 		header('Location: /vasek/home/' . strtolower(basename(__FILE__, '.php')), TRUE);
 		die();
@@ -23,7 +23,7 @@ if (isset($_POST) && !empty($_POST)){
 
 			$json = json_encode([
 					'deviceID' => $subDeviceMaster['device_id'],
-					'type'=> htmlspecialchars($subDevice['type']),
+					'type'=> $subDevice['type'],
 					'value'=> $subDeviceValue,
 			]);
 		}
@@ -36,7 +36,7 @@ if (isset($_POST) && !empty($_POST)){
 		], JSON_PRETTY_PRINT);
 		$onDays = ($_POST['day'] != '' ? json_encode($_POST['day']) : '');
 
-		AutomationManager::create('name', $onDays, $doCode, $ifCode, (isset ($_POST['automation_id']) ? $_POST['automation_id'] : ""));
+		AutomationManager::create($_POST['name'], $onDays, $doCode, $ifCode, (isset ($_POST['automation_id']) ? $_POST['automation_id'] : ""));
 
 		header('Location: /vasek/home/' . strtolower(basename(__FILE__, '.php')), TRUE);
 		die();
diff --git a/app/lang/cs.php b/app/lang/cs.php
index d5090a9..92f5501 100644
--- a/app/lang/cs.php
+++ b/app/lang/cs.php
@@ -44,6 +44,7 @@ $lang = [
 	'l_inMinutes' => 'v minutách',
 	'l_sleepTime' => 'Doba spánku zařízení',
 	'l_atHome' => 'Doma Jsou',
+	'l_nameAt' => 'Název',
 
 	//Title
 	't_createScene' => 'Vytvořit scénu',
diff --git a/app/lang/en.php b/app/lang/en.php
index e6952e8..c29271f 100644
--- a/app/lang/en.php
+++ b/app/lang/en.php
@@ -44,6 +44,7 @@ $lang = [
 	'l_inMinutes' => 'in minutes',
 	'l_sleepTime' => 'Device sleep Time',
 	'l_atHome' => 'At home',
+	'l_nameAt' => 'Name',
 
 	//Title
 	't_createScene' => 'Create Scene',
diff --git a/app/templates/part/automationButton.phtml b/app/templates/part/automationButton.phtml
index 3ceb814..b9f3bdd 100644
--- a/app/templates/part/automationButton.phtml
+++ b/app/templates/part/automationButton.phtml
@@ -37,10 +37,11 @@
                 </div>
                 <div class="col">
                     <h5 class="text-right break-all">
-                        <?php 
-                        if (!in_array($AUTOMATIONDATA['ifSomething'], ["sunRise", "sunSet"])) {
+                        <?php
+                        /*if (!in_array($AUTOMATIONDATA['ifSomething'], ["sunRise", "sunSet"])) {
                             echo $AUTOMATIONDATA['ifSomething'];
-                        }
+                        }*/
+                        echo $AUTOMATIONDATA['name'];
                         ?>
                     </h5>
                 </div>
@@ -50,6 +51,14 @@
                     <?php echo implode(', ',$AUTOMATIONDATA['onDays']);?>
                 </div>
             </div>
+            <div class="row">
+                <div class="col">
+                    <a class="button is-primary m-1" onclick="$('#modal').removeClass('modal-container-hiden').show();">restart</a>
+                </div>
+                <div class="col">
+                    <a class="button is-primary m-1" onclick="$('#modal').removeClass('modal-container-hiden').show();">deaktivovat</a>
+                </div>
+            </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/part/automationCreate.phtml b/app/templates/part/automationCreate.phtml
index 8bafb13..57f871a 100644
--- a/app/templates/part/automationCreate.phtml
+++ b/app/templates/part/automationCreate.phtml
@@ -4,6 +4,10 @@
         <h4 class="mb-4"><?php echo $LANG['t_createAutomation']?></h4>
         <form method="post">
             <div class="field">
+                <div class="label"><?php echo $LANG['l_nameAt']?></div>
+                <div class="field">
+                    <input class="input" type="text" name="name" required/>
+                </div>
                 <div class="label"><?php echo $LANG['l_runAt']?></div>
                 <div class="field">
                     <select class="input" name="atSelector" id="valueSelector" required>
@@ -29,12 +33,12 @@
                 <div class="label"><?php echo $LANG['l_affectedDevices']?></div>
                 <div class="field">
                     <select class="input" name="devices[]" multiple>
-                        <?php foreach ($SUBDEVICES as $subDeviceKey => $subDeviceValue){ 
+                        <?php foreach ($SUBDEVICES as $subDeviceKey => $subDeviceValue){
                             if ($subDeviceValue['type'] != 'on/off') continue;?>
                             <option value="<?php echo $subDeviceValue['masterDevice']; ?>"><?php echo $subDeviceValue['name']; ?></option>
                         <?php } ?>
                     </select>
-                    
+
                 </div>
                 <div class="label"><?php echo $LANG['l_atDays']?></div>
                 <div class="field">
@@ -62,4 +66,4 @@
             <input type="submit" class="button" name="modalNext" value="<?php echo $LANG['b_next']?>"/>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/part/automationCreateFinal.phtml b/app/templates/part/automationCreateFinal.phtml
index 909ece1..7d372f9 100644
--- a/app/templates/part/automationCreateFinal.phtml
+++ b/app/templates/part/automationCreateFinal.phtml
@@ -5,6 +5,7 @@
         <form method="post">
             <div class="field">
                 <input type="hidden" name="atSelector" value="<?php echo $_POST['atSelector']; ?>" required/>
+                <input type="hidden" name="name" value="<?php echo $_POST['name']; ?>" required/>
                 <input type="hidden" name="atSelectorValue" value="<?php if (isset($_POST['atTime'])) {
                     echo $_POST['atTime'];
                 } else if (isset($_POST['atDeviceValue'])) {
@@ -12,7 +13,7 @@
                     $subDeviceValue = $_POST['atDeviceValueInt'];
                     $subDevice = SubDeviceManager::getSubDevice($subDeviceId);
                     $subDeviceMaster = SubDeviceManager::getSubDeviceMaster($subDeviceId,$subDevice['type']);
-                    
+
                     $json = json_encode([
                         'deviceID' => $subDeviceMaster['device_id'],
                         'type'=> htmlspecialchars($subDevice['type']),
@@ -36,4 +37,4 @@
             <input type="submit" class="button" name="modalFinal" value="Next"/>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/part/automationEdit.phtml b/app/templates/part/automationEdit.phtml
index 778d31a..dad21de 100644
--- a/app/templates/part/automationEdit.phtml
+++ b/app/templates/part/automationEdit.phtml
@@ -7,6 +7,10 @@
         <form method="post">
             <input name="automation_id" type="hidden" value="<?php echo $AUTOMATIONID; ?>">
             <div class="field">
+                <div class="label"><?php echo $LANG['l_nameAt']?></div>
+                <div class="field">
+                    <input class="input" type="text" name="name" value="<?php echo (isset ($AUTOMATION['name']) ? $AUTOMATION['name'] : ""); ?>" required/>
+                </div>
                 <div class="label"><?php echo $LANG['l_runAt']?></div>
                 <div class="field">
                     <?php //TODO Dodělat identifikaci pro Selctor události a selector času zařízení hodnoty ?>
diff --git a/app/views/Automation.php b/app/views/Automation.php
index 3000477..89940d1 100644
--- a/app/views/Automation.php
+++ b/app/views/Automation.php
@@ -28,7 +28,7 @@ class Automation extends Template
 				];
 			}
 			$automations[$automationData['automation_id']] = [
-				'name' => '',
+				'name' => $automationData['name'],
 				'onDays' => json_decode($automationData['on_days']),
 				'ifSomething' => $automationData['if_something'],
 				'doSomething' => $doSomething,