diff --git a/settings/index.html b/settings/index.html
index f63bf520..83cb5c91 100644
--- a/settings/index.html
+++ b/settings/index.html
@@ -838,7 +838,7 @@
   </head>
 
 
-  <body>
+  <body class="noMargin">
     <!--
     <h1 data-i18n="settings.title">.title</h1>
     <p data-i18n="settings.subtitle">.subtitle</p>
@@ -900,7 +900,7 @@ <h1 data-i18n="settings.title">.title</h1>
 
     <!-- Welcome page -->
     <div id="welcomePage" class="tabcontent">
-      <fieldset class="withMargin">
+      <fieldset>
         <legend data-i18n="settings.mode.powerSettings">mode.powerSettings</legend>
         <table class="settings_table">
           <tr>
@@ -1733,7 +1733,7 @@ <h1 data-i18n="settings.title">.title</h1>
 
     <!-- Mode specific page -->
     <div id="priorityPage" class="tabcontent">
-      <fieldset class="withMargin">
+      <fieldset>
         <legend><div class="blockHeader" data-i18n="settings.mode.operatingMode">mode.operatingMode</div></legend>
         <table class="settings_table">
           <tr>
@@ -1797,7 +1797,7 @@ <h1 data-i18n="settings.title">.title</h1>
     </div>
     <!-- Mode specific page end -->
 
-    <div class="right" style="display:none;" id="saveOuter">
+    <div class="right withMargin" style="display:none;" id="saveOuter">
     <button id="save" class="homey-button-primary-full" data-i18n="settings.saveButton">.saveButton</button>
     </div>
 
@@ -3041,7 +3041,7 @@ <h1 data-i18n="settings.title">.title</h1>
           //resizeIframe('schedulePage', message.w, message.h);
         } else if (message.id === 'wizAction') {
           runActionQueue(message.actionQueue);
-          document.getElementById('main_menu').style.zIndex = (message.actionQueue[0].action === UI_SHOW_OVERLAY) ? 1 : 12;
+          document.getElementById('main_menu').style.zIndex = (message.actionQueue[0].action === UI_SHOW_OVERLAY) ? 1 : 15;
         }
       };
 
diff --git a/settings/style.css b/settings/style.css
index f8932b59..c6186469 100644
--- a/settings/style.css
+++ b/settings/style.css
@@ -1,8 +1,12 @@
+.noMargin {
+  margin: 0px !important;
+  padding: 0px !important;
+}
+
 body {
-    font-size: 100%;
-    background-color: powderblue;
-    overflow: auto;
-    margin: 0px;
+  font-size: 100%;
+  background-color: powderblue;
+  overflow: auto;
 }
 
 img {
@@ -31,7 +35,7 @@ p {
 }
 
 .withMargin {
-  margin: 6px;
+  padding: 20px;
 }
 
 .small {
@@ -259,7 +263,7 @@ p {
   border: 1px solid rgba(0,0,0,0.5);
   border-radius: 8px;
   box-shadow: 2px 2px 10px gray;
-  z-index: 15;
+  z-index: 12;
 }
 
 #loadingText {
@@ -296,7 +300,7 @@ p {
   cursor: pointer;
   border-collapse: collapse;
   border: 0px solid black;
-  z-index: 12;
+  z-index: 15;
 }
 
 .menuitem .dropdown{
diff --git a/settings/subpages/schedule.html b/settings/subpages/schedule.html
index f26c4769..8feb041f 100644
--- a/settings/subpages/schedule.html
+++ b/settings/subpages/schedule.html
@@ -1171,7 +1171,10 @@ <h3>Time Schedule Preview</h3>
         const dragTemp = document.getElementById('dragTemp');
         let cpos = canvas.getBoundingClientRect();
         let dpos = dragTemp.getBoundingClientRect();
-        let pos = {x: Math.max(event.clientX - cpos.left - dpos.width - 40, -cpos.left), y: Math.max(event.clientY - cpos.top - dpos.height - 20, -cpos.top)};
+        let pos = {
+          x: Math.max(event.clientX - cpos.left - dpos.width - 40, 0),
+          y: Math.max(event.clientY - cpos.top - dpos.height - 20, 0)
+        };
         dragTemp.style.top = `${pos.y}px`;
         dragTemp.style.left = `${pos.x}px`;
         dragTemp.innerHTML = `${newTemp}`;
@@ -1196,6 +1199,7 @@ <h3>Time Schedule Preview</h3>
 
     function abortDragThermo(canvas, event) {
       if (thermoIsDragging) {
+        displaySaveHint();
         draggingThermo(canvas, event);
         document.getElementById('dragTemp').style.display = 'none';
         thermoIsDragging = false;
