diff --git a/octoprint_enclosure/templates/enclosure_tab.jinja2 b/octoprint_enclosure/templates/enclosure_tab.jinja2
index 23e4cf3..585c4d0 100644
--- a/octoprint_enclosure/templates/enclosure_tab.jinja2
+++ b/octoprint_enclosure/templates/enclosure_tab.jinja2
@@ -1,7 +1,50 @@
-<div class="input-append">
-   <h4>Enclosure Info </h4>
-   <div class="control-group">
-        <label class="control-label" for="settings-enclosure-info">{{ _('Enclosure Temperature') }}</label>
-        <p  data-bind="html: enclosureTemp"></p>
-    </div>
-</div>
\ No newline at end of file
+<h4>{{ _('Heater') }}</h4>
+<table class="table table-bordered table-hover" style="table-layout: fixed; width: 100%; margin-top: 20px">
+    <tr>
+        <th style="width: 18%"></th>
+        <th style="width: 12%; text-align: right">{{ _('Actual') }}</th>
+        <th style="width: 35%">{{ _('Target') }}</th>
+    </tr>
+    <tr>
+    	<th style="vertical-align: middle">{{ _('Enclosure') }}</th>
+    	<td style="text-align: right; vertical-align: middle" data-bind="html: enclosureTemp"></td>
+    	<td style="vertical-align: middle; overflow: visible">
+        	<div class="input-append">
+            <input type="text" class="input-mini text-right tempInput" id="enclosureSetTemp" data-bind="attr: {placeholder: cleanTemperature(requestEnclosureSetTemperature())}">
+            <span class="add-on">&deg;C</span>
+                <div class="btn-group">
+                    <button type="submit" data-bind="click: setTemperature, enable: settings.settings.plugins.enclosure.heaterEnable && isConnected()" class="btn">{{ _('Set') }}</button>
+                    <button class="btn dropdown-toggle" data-toggle="dropdown" data-bind="enable: settings.settings.plugins.enclosure.heaterEnable && isConnected()">
+                    <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li>
+                                <a href="#" data-bind="click: turnOffHeater">{{ _('Off') }}</a>
+                            </li>
+                        </ul>
+                </div>
+        	</div>
+    	</td>
+    </tr>
+    <tr>
+        <th style="vertical-align: middle">{{ _('Humidity') }}</th>
+        <td style="text-align: right; vertical-align: middle" data-bind="html: enclosureHumidity"></td>
+        <th></th>
+    </tr>
+</table>
+<h4>{{ _('Fan') }}</h4>
+<button type="submit" data-bind="click: turnFanOn(true)" class="btn">Turn on</button> 
+<button type="submit" data-bind="click: turnFanOn(false)"  class="btn">Turn off</button>
+<h4>{{ _('Light') }}</h4>
+<button type="submit" data-bind="click: turnLightOn(true)"  class="btn">Turn on</button>
+<button type="submit" data-bind="click: turnLightOn(false)"  class="btn">Turn off</button>
+
+
+
+
+
+
+   
+
+
+