diff --git a/greenhouseui/static/scripts/greenhouse.js b/greenhouseui/static/scripts/greenhouse.js
index f958ae7..ae1b8f2 100644
--- a/greenhouseui/static/scripts/greenhouse.js
+++ b/greenhouseui/static/scripts/greenhouse.js
@@ -94,13 +94,18 @@ var parse_config = function (event) {
     var config = JSON.parse(event)
     var output = "einschalten"
     var visibility = 'hidden'
+    var visibility_heat = 'visible'
     if(config.heat && config.heat.id == '1') {
         if(config.heat.autostate) {
             output = "ausschalten"
             visibility = "visible"
+            visibility_heat = "hidden"
             document.getElementById("on_temperature").innerHTML = config.heat.on_temperature;
             document.getElementById("off_temperature").innerHTML = config.heat.off_temperature;
         }
+        document.getElementById("heat_switch_label").style.visibility = visibility_heat
+        document.getElementById("heat_switch").style.visibility = visibility_heat
+    
         document.getElementById("heat_auto_switch").value = output;
         document.getElementById("config_temperatures").style.visibility = visibility
     }
diff --git a/greenhouseui/templates/index.html b/greenhouseui/templates/index.html
index 23d77ee..82f76c9 100644
--- a/greenhouseui/templates/index.html
+++ b/greenhouseui/templates/index.html
@@ -20,20 +20,24 @@
         <div>
             <img src="{{url_for('static', filename='greenhouse_temperature.png')}}"/>
         </div>
-        <table class="center">
-            <tr>
-                <td class="table_left">Heizung</td>
-                <td class="input">
-                    <input id="heat_switch" type="submit" value="" onclick="on_switch_heat()"></input>
-                </td>
-            </tr>
-            <tr>
-                <td class="table_left">Frostwächter</td>
-                <td class="input">
-                    <input id="heat_auto_switch" type="submit" value="" onclick="on_switch_heat_autostate()"></input>
-                </td>
-            </tr>
-        </table>
+        <div>
+            <table class="center">
+                <tr>
+                    <td class="table_left" id="heat_switch_label" style="visibility: hidden;">Heizung </td>
+                    <td class="input">
+                        <input id="heat_switch" style="visibility: hidden;" type="submit" value="" onclick="on_switch_heat()"></input>
+                    </td>
+                </tr>
+            </table>
+            <table class="center">
+                <tr>
+                    <td class="table_left">Frostwächter</td>
+                    <td class="input">
+                        <input id="heat_auto_switch" type="submit" value="" onclick="on_switch_heat_autostate()"></input>
+                    </td>
+                </tr>
+            </table>
+        </div>
         <div id="config_temperatures" style="visibility:hidden;">
             <table class="center">
                 <tr>