diff --git a/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2 b/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2
index 7ec0d7a..02341b1 100644
--- a/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2
+++ b/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2
@@ -92,22 +92,22 @@
     </div> -->
     <!-- /ko -->
     <!-- ko ifnot: ($data.output_type() == "gcode_output" || $data.output_type() == "temperature_alarm" || $data.output_type() == "shell_output" || $data.output_type() == "ledstrip") -->
-    <!-- <div class="control-group"> -->
-      <!-- <label class="control-label">{{ _('IO Number') }}</label> -->
-      <!-- <div class="controls"> -->
-        <!-- <input type="text" class="input-block-level" data-bind="value: gpio_pin"> -->
+    <div class="control-group">
+      <label class="control-label">{{ _('IO Number') }}</label>
+      <div class="controls">
+        <input type="text" class="input-block-level" data-bind="value: gpio_pin">
         <!-- ko ifnot: ($data.output_type() == "neopixel_indirect")  -->
-        <!-- <span class="help-inline">GPIO number that will be controlled.</span> -->
+        <span class="help-inline">GPIO number that will be controlled.</span>
+        /ko
+        ko if: ($data.output_type() == "neopixel_indirect") 
+        <span class="help-inline">
+          <span class="label label-danger">Attention</span> Neopixel requires a microcontroller (ex: arduino) 
+            connected to I2C bus. This is the pin on the
+          microcontroller that is connected to the Neopixel.
+        </span>
         <!-- /ko -->
-        <!-- ko if: ($data.output_type() == "neopixel_indirect")  -->
-        <!-- <span class="help-inline"> -->
-          <!-- <span class="label label-danger">Attention</span> Neopixel requires a microcontroller (ex: arduino)  -->
-            <!-- connected to I2C bus. This is the pin on the -->
-          <!-- microcontroller that is connected to the Neopixel. -->
-        <!-- </span> -->
-        <!-- /ko -->
-      <!-- </div> -->
-    <!-- </div> -->
+      </div>
+    </div>
     <!-- /ko -->
 
     <!-- ko if: ($data.output_type() == "pwm" ) -->
@@ -152,7 +152,7 @@
     <!-- /ko -->
 
     <!-- ko if: ($data.output_type() == "regular" || ($data.output_type() == "pwm" && !$data.pwm_temperature_linked()) ) -->
-    <!-- <div class="control-group">
+    <div class="control-group">
       <div class="controls">
         <label class="checkbox">
           <input type="checkbox" data-bind="checked: toggle_timer"> {{ _('Timer Toggle') }}
@@ -161,9 +161,9 @@
           PWM pins it will use the default PWM value when ON.
         </span>
       </div>
-    </div> -->
+    </div>
     <!-- ko if: ($data.toggle_timer()) -->
-    <!-- <div class="control-group">
+    <div class="control-group">
       <label class="control-label">{{ _('On Time') }}</label>
       <div class="controls">
         <input type="text" class="input-block-level" data-bind="value: toggle_timer_on">
@@ -176,7 +176,7 @@
         <input type="text" class="input-block-level" data-bind="value: toggle_timer_off">
         <span class="help-inline">Time in secconds that the GPIO will remain when OFF</span>
       </div>
-    </div> -->
+    </div>
     <!-- /ko -->
     <!-- /ko -->
 
@@ -184,7 +184,7 @@
     <!-- ko ifnot: (($data.output_type() == "regular" || $data.output_type() == "pwm") &&  $data.toggle_timer()) -->
     <!-- ko ifnot: ($data.output_type() == "gcode_output" || $data.output_type() == "temperature_alarm" || $data.output_type() == "shell_output") -->
     <!-- ko ifnot: ($data.output_type() == "pwm" && $data.pwm_temperature_linked()) -->
-    <!-- <div class="control-group">
+    <div class="control-group">
       <div class="controls">
         <label class="checkbox">
           <input type="checkbox" data-bind="checked: startup_with_server"> {{ _('Start with server') }}
@@ -199,10 +199,10 @@
         </label>
         <span class="help-inline">Choose if output should turn on automatically when print starts</span>
       </div>
-    </div> -->
+    </div>
     <!-- /ko -->
     <!-- ko if: $data.auto_startup  -->
-    <!-- <div data-bind="attr: {id: 'auto_startupField_' + $index() }">
+    <div data-bind="attr: {id: 'auto_startupField_' + $index() }">
       <div class="control-group">
         <label class="control-label">{{ _('Startup Delay / Hour') }}</label>
         <div class="controls">
@@ -212,21 +212,21 @@
             forget to check timezone of your Raspberry Pi.</span>
         </div>
       </div>
-    </div> -->
+    </div>
     <!-- /ko -->
     <!-- /ko -->
     <!-- ko ifnot: ($data.output_type() == "gcode_output" || $data.output_type() == "temperature_alarm" || $data.output_type() == "shell_output") -->
-    <!-- <div class="control-group">
+    <div class="control-group">
       <div class="controls">
         <label class="checkbox">
           <input type="checkbox" data-bind="checked: auto_shutdown"> {{ _('Auto Shutdown') }}
         </label>
         <span class="help-inline">Choose if output should turn off automatomatically when print finishes</span>
       </div>
-    </div> -->
+    </div>
     <!-- /ko -->
     <!-- ko if: $data.auto_shutdown  -->
-    <!-- <div class="control-group">
+    <div class="control-group">
       <div class="controls">
         <label class="checkbox">
           <input type="checkbox" data-bind="checked: shutdown_on_failed"> {{ _('Shutdown on Failed or Canceled') }}
@@ -248,7 +248,7 @@
             <b>Link PWM to Temperature</b> option</span>
         </div>
       </div>
-    </div> -->
+    </div>
     <!-- /ko -->
     <!-- /ko -->
 
@@ -457,14 +457,14 @@
     </div> -->
     <!-- /ko -->
     <!-- ko if: ($data.output_type() == "gcode_output")  -->
-    <!-- <div class="control-group">
+    <div class="control-group">
       <label class="control-label" for="settings-enclosure-filament-sensor">{{ _('Gcode') }}</label>
       <div class="controls">
         <textarea rows="4" class="block" data-bind="value: gcode"></textarea>
         <span class="help-inline">GCODE that will be sent to the printer. You should add
           <code>ENTER</code> on the end of every line sent to the printer</span>
       </div>
-    </div> -->
+    </div>
     <!-- /ko -->
 
     <div class="control-group">
diff --git a/octoprint_enclosure/static/js/enclosure.js b/octoprint_enclosure/static/js/enclosure.js
index d34d400..df9580c 100644
--- a/octoprint_enclosure/static/js/enclosure.js
+++ b/octoprint_enclosure/static/js/enclosure.js
@@ -4,7 +4,7 @@ $(function () {
     return {
       index_id: index_id,
       label: "",
-      output_type: "Regular",
+      output_type: "regular",
       gpio: {
         pin_name: ""
       }
@@ -15,10 +15,63 @@ $(function () {
     var self = this;
 
     self.isNew = ko.observable(false);
+    // general info
     self.index_id = ko.observable();
     self.label = ko.observable();
     self.output_type = ko.observable();
+    // gpio output
     self.gpio_pin = ko.observable();
+    self.active_low = ko.observable();
+    // gcode output
+    self.gcode = ko.observable();
+    // neopixel output
+    self.neopixel_count = ko.observable();
+    self.neopixel_brightness = ko.observable();
+    self.default_neopixel_color = ko.observable();
+    // other output configurations
+    self.hide_btn_ui = ko.observable();
+    self.show_on_navbar = ko.observable();
+    // pwm output
+    self.pwm_temperature_linked = ko.observable();
+    self.duty_a = ko.observable();
+    self.temperature_a = ko.observable();
+    self.duty_b = ko.observable();
+    self.temperature_b = ko.observable();
+    self.pwm_frequency = ko.observable();
+    self.default_duty_cycle = ko.observable();
+    // led strip output
+    self.led_trip_gpio_clk = ko.observable()
+    self.led_strip_gpio_data = ko.observable()
+    self.default_led_strip_color = ko.observable()
+    // schedule config
+    self.toggle_timer =  ko.observable()
+    self.toggle_timer_on =  ko.observable()
+    self.toggle_timer_off =  ko.observable()
+    self.startup_with_server =  ko.observable()
+    self.auto_startup =  ko.observable()
+    self.startup_time_delay =  ko.observable()
+    self.auto_shutdown =  ko.observable()
+    self.shutdown_on_failed =  ko.observable()
+    self.shutdown_time_delay =  ko.observable()
+    // shell script output
+    self.shell_script =  ko.observable()
+    // temp alarm output
+    self.alarm_linked_temp_sensor =  ko.observable()
+    self.alarm_set_temp =  ko.observable()
+    self.controlled_io =  ko.observable()
+    self.controlled_io_set_value =  ko.observable()
+    // temp control output
+    self.temp_ctr_linked_sensor =  ko.observable()
+    self.temp_ctr_type =  ko.observable()
+    self.temp_ctr_type =  ko.observable()
+    self.temp_ctr_type =  ko.observable()
+    self.temp_ctr_default_value =  ko.observable()
+    self.temp_ctr_deadband =  ko.observable()
+    self.temp_ctr_max_temp =  ko.observable()
+
+
+
+
     self.enclosureOutputs = undefined;
 
     self.fromOutputData = function (data) {
diff --git a/octoprint_enclosure/templates/output_editor/gcode_output.jinja2 b/octoprint_enclosure/templates/output_editor/gcode_output.jinja2
index e4852a9..0363a5d 100644
--- a/octoprint_enclosure/templates/output_editor/gcode_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/gcode_output.jinja2
@@ -3,7 +3,7 @@
   <div class="control-group">
     <label class="control-label" for="settings-enclosure-filament-sensor">{{ _('Gcode') }}</label>
     <div class="controls">
-      <textarea rows="4" class="block" data-bind="value: gcode"></textarea>
+      <textarea rows="4" class="block" data-bind="value: outputEditor.gcode"></textarea>
       <span class="help-inline">GCODE that will be sent to the printer. You should add
         <code>ENTER</code> on the end of every line sent to the printer</span>
     </div>
diff --git a/octoprint_enclosure/templates/output_editor/io_output.jinja2 b/octoprint_enclosure/templates/output_editor/io_output.jinja2
index 1fa4a78..1f8a3d0 100644
--- a/octoprint_enclosure/templates/output_editor/io_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/io_output.jinja2
@@ -11,7 +11,7 @@
   <div class="control-group">
     <div class="controls">
       <label class="checkbox">
-        <input type="checkbox" data-bind="checked: active_low"> {{ _('Active Low') }}
+        <input type="checkbox" data-bind="checked: outputEditor.active_low"> {{ _('Active Low') }}
       </label>
       <span class="help-inline">Active low means that the GPIO will turn on when receive a low signal (ground) from Raspberry PI</span>
     </div>
diff --git a/octoprint_enclosure/templates/output_editor/rgb_strip_output.jinja2 b/octoprint_enclosure/templates/output_editor/led_strip_output.jinja2
similarity index 85%
rename from octoprint_enclosure/templates/output_editor/rgb_strip_output.jinja2
rename to octoprint_enclosure/templates/output_editor/led_strip_output.jinja2
index 8049f62..30735eb 100644
--- a/octoprint_enclosure/templates/output_editor/rgb_strip_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/led_strip_output.jinja2
@@ -3,19 +3,19 @@
     <div class="control-group">
         <label class="control-label">{{ _('CLK') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: ledstrip_gpio_clk">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.led_trip_gpio_clk">
           <span class="help-inline">Choose any GPIO pin to provide the Clock signal</span>
         </div>
         <label class="control-label">{{ _('DAT') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: ledstrip_gpio_dat">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.led_strip_gpio_data">
           <span class="help-inline">Choose any GPIO pin to provide the Data</span>
         </div>
       </div>
       <div class="control-group">
         <label class="control-label">{{ _('Color') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: default_ledstrip_color, attr: {name: 'colorpicker' } , click: $root.showColorPicker()">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.default_led_strip_color, click: $root.showColorPicker()">
           <span class="help-inline">Value needs to follow the format rgb(value_red,value_green,value_blue) where values should be between 0 and 255</span>
         </div>
       </div>
diff --git a/octoprint_enclosure/templates/output_editor/main_screen.jinja2 b/octoprint_enclosure/templates/output_editor/main_screen.jinja2
index a42746f..12864a3 100644
--- a/octoprint_enclosure/templates/output_editor/main_screen.jinja2
+++ b/octoprint_enclosure/templates/output_editor/main_screen.jinja2
@@ -9,10 +9,42 @@
         <div class="full-sized-box">
             <ul class="nav nav-pills">
                 <li class="active"><a href="#settings_outputs_edit_dialog_general" data-toggle="tab">{{ _('General') }}</a></li>
-                 <!-- ko ifnot: (outputEditor.output_type() == "gcode_output" || outputEditor.output_type() == "temperature_alarm" || outputEditor.output_type() == "shell_output" || outputEditor.output_type() == "led_strip") -->
+                 <!-- ko ifnot: (outputEditor.output_type() == "gcode_output" || outputEditor.output_type() == "temperature_alarm" || outputEditor.output_type() == "shell_output" || outputEditor.output_type() == "led_strip" || outputEditor.output_type() == "neopixel") -->
                 <li><a href="#settings_outputs_edit_dialog_io" data-toggle="tab">{{ _('IO Settings') }}</a></li>
                 <!-- /ko -->
 
+                 <!-- ko if: (outputEditor.output_type() == "gcode_output")  -->
+                <li><a href="#settings_outputs_edit_dialog_gcode" data-toggle="tab">{{ _('GCode') }}</a></li>
+                 <!-- /ko -->
+
+                <!-- ko if: (outputEditor.output_type() == "led_strip")  -->
+                <li><a href="#settings_outputs_edit_dialog_led_strip" data-toggle="tab">{{ _('LED Strip') }}</a></li>
+                <!-- /ko -->
+
+                <!-- ko if: (outputEditor.output_type() == "neopixel")  -->
+                <li><a href="#settings_outputs_edit_dialog_neopixel" data-toggle="tab">{{ _('Neopixel') }}</a></li>
+                <!-- /ko -->
+
+                <!-- ko if: (outputEditor.output_type() == "pwm")  -->
+                <li><a href="#settings_outputs_edit_dialog_pwm" data-toggle="tab">{{ _('PWM') }}</a></li>
+                <!-- /ko -->
+
+                <!-- ko if: (outputEditor.output_type() == "temp_hum_control")  -->
+                <li><a href="#settings_outputs_edit_dialog_temp_hum_control" data-toggle="tab">{{ _('Temp / Hum Control') }}</a></li>
+                <!-- /ko -->
+
+                <!-- ko if: (outputEditor.output_type() == "temperature_alarm")  -->
+                <li><a href="#settings_outputs_edit_dialog_temperature_alarm" data-toggle="tab">{{ _('Temperature Alarm) }}</a></li>
+                <!-- /ko -->
+
+                <!-- ko if: (outputEditor.output_type() == "shell_output")  -->
+                <li><a href="#settings_outputs_edit_dialog_shell_output" data-toggle="tab">{{ _('Shell Output') }}</a></li>
+                <!-- /ko -->
+
+                <li><a href="#settings_outputs_edit_dialog_schedule" data-toggle="tab">{{ _('Schedule') }}</a></li>
+
+                <li><a href="#settings_outputs_edit_dialog_other" data-toggle="tab">{{ _('Other') }}</a></li>
+
             </ul>
 
             <div class="tab-content">
@@ -24,6 +56,41 @@
                     {% include "output_editor/io_output.jinja2" %}
                 </div>
 
+                <div id="settings_outputs_edit_dialog_gcode" class="tab-pane">
+                    {% include "output_editor/gcode_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_led_strip" class="tab-pane">
+                    {% include "output_editor/led_strip_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_neopixel" class="tab-pane">
+                    {% include "output_editor/neopixel_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_pwm" class="tab-pane">
+                    {% include "output_editor/pwm_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_temp_hum_control" class="tab-pane">
+                    {% include "output_editor/temp_control_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_temperature_alarm" class="tab-pane">
+                    {% include "output_editor/temp_alarm_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_shell_output" class="tab-pane">
+                    {% include "output_editor/shell_script_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_schedule" class="tab-pane">
+                    {% include "output_editor/shell_script_output.jinja2" %}
+                </div>
+
+                <div id="settings_outputs_edit_dialog_other" class="tab-pane">
+                    {% include "output_editor/shell_script_output.jinja2" %}
+                </div>
 
             </div>
         </div>
diff --git a/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2 b/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2
index 05e6187..4c9f0e9 100644
--- a/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2
@@ -3,21 +3,21 @@
     <div class="control-group">
         <label class="control-label">{{ _('Number of LEDS') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: neopixel_count">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.neopixel_count">
           <span class="help-inline">Number of led's on strip</span>
         </div>
       </div>
       <div class="control-group">
         <label class="control-label">{{ _('Brightness') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: neopixel_brightness">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.neopixel_brightness">
           <span class="help-inline">Value between 0 and 255</span>
         </div>
       </div>
       <div class="control-group">
         <label class="control-label">{{ _('Default Color') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: default_neopixel_color, attr: {name: 'colorpicker' } , click: $root.showColorPicker()">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.default_neopixel_color, attr: {name: 'colorpicker' } , click: $root.showColorPicker()">
           <span class="help-inline">Value needs to follow the format rgb(value_red,value_green,value_blue) where values should be between 0 and 255</span>
         </div>
       </div>
diff --git a/octoprint_enclosure/templates/output_editor/other_config.jinja2 b/octoprint_enclosure/templates/output_editor/other_config.jinja2
index 2bcefb1..2ae3bf9 100644
--- a/octoprint_enclosure/templates/output_editor/other_config.jinja2
+++ b/octoprint_enclosure/templates/output_editor/other_config.jinja2
@@ -3,7 +3,7 @@
     <div class="control-group">
         <div class="controls">
           <label class="checkbox">
-            <input type="checkbox" data-bind="checked: hide_btn_ui"> {{ _('Hide UI Button') }}
+            <input type="checkbox" data-bind="checked: outputEditor.hide_btn_ui"> {{ _('Hide UI Button') }}
           </label>
           <span class="help-inline">If you plan to use a physical button (INPUT) and want to hide the button from enclosure tab check this.</span>
         </div>
@@ -12,7 +12,7 @@
       <div class="control-group">
         <div class="controls">
           <label class="checkbox">
-            <input type="checkbox" data-bind="checked: show_on_navbar"> {{ _('Show Button on Navbar') }}
+            <input type="checkbox" data-bind="checked: outputEditor.show_on_navbar"> {{ _('Show Button on Navbar') }}
           </label>
           <span class="help-inline">Add shortcut on navbar to toggle output</span>
         </div>
diff --git a/octoprint_enclosure/templates/output_editor/pwm_output.jinja2 b/octoprint_enclosure/templates/output_editor/pwm_output.jinja2
index aa1731e..df6547f 100644
--- a/octoprint_enclosure/templates/output_editor/pwm_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/pwm_output.jinja2
@@ -2,7 +2,7 @@
     <div class="control-group">
         <div class="controls">
           <label class="checkbox">
-            <input type="checkbox" data-bind="checked: pwm_temperature_linked"> {{ _('Link PWM to Temperature') }}
+            <input type="checkbox" data-bind="checked: outputEditor.pwm_temperature_linked"> {{ _('Link PWM to Temperature') }}
           </label>
           <span class="help-inline">Link PWM ouput to temperature. PWM output will be interpolated between the point from duty A, temperature A -> duty
             B, temperature B. This output will automatically start when a print starts and will default to the default
@@ -13,25 +13,25 @@
       <div class="control-group">
         <label class="control-label">{{ _('Duty A') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: duty_a">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.duty_a">
         </div>
       </div>
       <div class="control-group">
         <label class="control-label">{{ _('Temperature A') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: temperature_a">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.temperature_a">
         </div>
       </div>
       <div class="control-group">
         <label class="control-label">{{ _('Duty B') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: duty_b">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.duty_b">
         </div>
       </div>
       <div class="control-group">
         <label class="control-label">{{ _('Temperature B') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: temperature_b">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.temperature_b">
         </div>
       </div>
 
@@ -39,14 +39,14 @@
       <div class="control-group">
         <label class="control-label">{{ _('PWM Frequency') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: pwm_frequency">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.pwm_frequency">
           <span class="help-inline">Value is in Hz</span>
         </div>
       </div>
       <div class="control-group">
         <label class="control-label">{{ _('Default Duty Cycle') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: default_duty_cycle">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.default_duty_cycle">
           <span class="help-inline">Value is in percentage, between 0 and 100</span>
         </div>
       </div>
diff --git a/octoprint_enclosure/templates/output_editor/schedule_config.jinja2 b/octoprint_enclosure/templates/output_editor/schedule_config.jinja2
index 683171a..317b4a6 100644
--- a/octoprint_enclosure/templates/output_editor/schedule_config.jinja2
+++ b/octoprint_enclosure/templates/output_editor/schedule_config.jinja2
@@ -1,9 +1,9 @@
 <form class="form-horizontal">
-
+  <!-- ko if: (outputEditor.output_type() == "regular" || (outputEditor.output_type() == "pwm" && !outputEditor.pwm_temperature_linked()) ) -->
   <div class="control-group">
     <div class="controls">
       <label class="checkbox">
-        <input type="checkbox" data-bind="checked: toggle_timer"> {{ _('Timer Toggle') }}
+        <input type="checkbox" data-bind="checked: outputEditor.toggle_timer"> {{ _('Timer Toggle') }}
       </label>
       <span class="help-inline">Toggle output every amount of seconds. It will start when the print starts and stop when
         print is complete. For
@@ -11,26 +11,31 @@
       </span>
     </div>
   </div>
-
+  <!-- ko if: (outputEditor.toggle_timer()) -->
   <div class="control-group">
     <label class="control-label">{{ _('On Time') }}</label>
     <div class="controls">
-      <input type="text" class="input-block-level" data-bind="value: toggle_timer_on">
+      <input type="text" class="input-block-level" data-bind="value: outputEditor.toggle_timer_on">
       <span class="help-inline">Time in seconds that the GPIO will remain ON</span>
     </div>
   </div>
   <div class="control-group">
     <label class="control-label">{{ _('Off Time') }}</label>
     <div class="controls">
-      <input type="text" class="input-block-level" data-bind="value: toggle_timer_off">
+      <input type="text" class="input-block-level" data-bind="value: outputEditor.toggle_timer_off">
       <span class="help-inline">Time in seconds that the GPIO will remain when OFF</span>
     </div>
   </div>
+  <!-- /ko -->
+  <!-- /ko -->
 
+  <!-- ko ifnot: ((outputEditor.output_type() == "regular" || outputEditor.output_type() == "pwm") &&  outputEditor.toggle_timer()) -->
+  <!-- ko ifnot: (outputEditor.output_type() == "gcode_output" || outputEditor.output_type() == "temperature_alarm" || outputEditor.output_type() == "shell_output") -->
+  <!-- ko ifnot: (outputEditor.output_type() == "pwm" && outputEditor.pwm_temperature_linked()) -->
   <div class="control-group">
     <div class="controls">
       <label class="checkbox">
-        <input type="checkbox" data-bind="checked: startup_with_server"> {{ _('Start with server') }}
+        <input type="checkbox" data-bind="checked: outputEditor.startup_with_server"> {{ _('Start with server') }}
       </label>
       <span class="help-inline">Choose if output should turn on automatically when OctoPrint starts</span>
     </div>
@@ -38,49 +43,58 @@
   <div class="control-group">
     <div class="controls">
       <label class="checkbox">
-        <input type="checkbox" data-bind="checked: auto_startup"> {{ _('Auto Startup') }}
+        <input type="checkbox" data-bind="checked: outputEditor.auto_startup"> {{ _('Auto Startup') }}
       </label>
       <span class="help-inline">Choose if output should turn on automatically when print starts</span>
     </div>
   </div>
-
-  <div data-bind="attr: {id: 'auto_startupField_' + $index() }">
+  <!-- /ko -->
+  <!-- ko if: outputEditor.auto_startup  -->
+  <div>
     <div class="control-group">
       <label class="control-label">{{ _('Startup Delay') }}</label>
       <div class="controls">
-        <input type="text" class="input-block-level" data-bind="value: startup_time">
+        <input type="text" class="input-block-level" data-bind="value: outputEditor.startup_time_delay">
         <span class="help-inline">Time delay in seconds to turn on GPIO when print starts</span>
       </div>
     </div>
   </div>
-
-  <div class="control-group">
-    <div class="controls">
-      <label class="checkbox">
-        <input type="checkbox" data-bind="checked: auto_shutdown"> {{ _('Auto Shutdown') }}
-      </label>
-      <span class="help-inline">Choose if output should turn off automatically when print finishes</span>
-    </div>
-  </div>
-
-  <div class="control-group">
-    <div class="controls">
-      <label class="checkbox">
-        <input type="checkbox" data-bind="checked: shutdown_on_failed"> {{ _('Shutdown on Failed or Canceled') }}
-      </label>
-      <span class="help-inline">Choose if output should turn off automatically when print is canceled or fails</span>
-    </div>
-  </div>
-
-  <div data-bind="attr: {id: 'auto_shutdownField_' + $index() }">
+  <!-- /ko -->
+  <!-- /ko -->
+    <!-- ko ifnot: (outputEditor.output_type() == "gcode_output" || outputEditor.output_type() == "temperature_alarm" || outputEditor.output_type() == "shell_output") -->
     <div class="control-group">
-      <label class="control-label">{{ _('Shutdown Delay') }}</label>
       <div class="controls">
-        <input type="text" class="input-block-level" data-bind="value: shutdown_time">
-        <span class="help-inline">Time delay in seconds to turn on GPIO when print finishes.</span>
-        <span class="label label-important">Attention</span>
+        <label class="checkbox">
+          <input type="checkbox" data-bind="checked: outputEditor.auto_shutdown"> {{ _('Auto Shutdown') }}
+        </label>
+        <span class="help-inline">Choose if output should turn off automatically when print finishes</span>
       </div>
     </div>
-  </div>
+
+    <!-- /ko -->
+    <!-- ko if: outputEditor.auto_shutdown  -->
+    <div class="control-group">
+      <div class="controls">
+        <label class="checkbox">
+          <input type="checkbox" data-bind="checked: outputEditor.shutdown_on_failed">
+          {{ _('Shutdown on Failed or Canceled') }}
+        </label>
+        <span class="help-inline">Choose if output should turn off automatically when print is canceled or fails</span>
+      </div>
+    </div>
+
+    <div>
+      <div class="control-group">
+        <label class="control-label">{{ _('Shutdown Delay') }}</label>
+        <div class="controls">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.shutdown_time_delay">
+          <span class="help-inline">Time delay in seconds to turn on GPIO when print finishes.</span>
+          <span class="label label-important">Attention</span>
+        </div>
+      </div>
+    </div>
+
+    <!-- /ko -->
+  <!-- /ko -->
 
 </form>
\ No newline at end of file
diff --git a/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2 b/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2
index baf2a4e..b570789 100644
--- a/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2
@@ -3,7 +3,7 @@
   <div class="control-group">
     <label class="control-label">{{ _('Script') }}</label>
     <div class="controls">
-      <input type="text" class="input-block-level" data-bind="value: shell_script">
+      <input type="text" class="input-block-level" data-bind="value: outputEditor.shell_script">
       <span class="help-inline">Shell script to be executed</span>
     </div>
   </div>
diff --git a/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2 b/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2
index 987a201..cd841e0 100644
--- a/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2
@@ -1,10 +1,20 @@
 <form class="form-horizontal">
 
+    <div class="control-group">
+        <label class="control-label">Temperature Sensor</label>
+        <div class="controls">
+          <select data-bind="options: $root.settings_hum_sensors, optionsText: 'label',
+                        optionsValue: 'index_id', value: outputEditor.alarm_linked_temp_sensor">
+          </select>
+          <span class="help-inline">Temperature sensor responsible for getting the value to be used. Configured on the input side of the plugin.</span>
+        </div>
+      </div>
+
     <div data-bind="attr: {id: 'temp_controlled_' + $index() }">
         <div class="control-group">
             <label class="control-label">{{ _('Set Temperature') }}</label>
             <div class="controls">
-                <input type="text" class="input-block-level" data-bind="value: alarm_set_temp">
+                <input type="text" class="input-block-level" data-bind="value: outputEditor.alarm_set_temp">
                 <span class="help-inline">Set temperature that will trigger the event</span>
             </div>
         </div>
@@ -12,7 +22,7 @@
             <label class="control-label"> Controlled IO</label>
             <div class="controls">
                 <select data-bind="options: $root.settings_outputs_regular, optionsText: 'label',
-                      optionsValue: 'index_id', value: $data.controlled_io">
+                      optionsValue: 'index_id', value: outputEditor.controlled_io">
                 </select>
                 <span class="help-inline">When the event happen, you want control which IO?</span>
             </div>
@@ -20,7 +30,7 @@
         <div class="control-group">
             <label class="control-label">Set Controlled IO Value</label>
             <div class="controls">
-                <select data-bind="value: controlled_io_set_value">
+                <select data-bind="value: outputEditor.controlled_io_set_value">
                     <option value="low">Low</option>
                     <option value="high">High</option>
                 </select>
diff --git a/octoprint_enclosure/templates/output_editor/temp_sensor_output.jinja2 b/octoprint_enclosure/templates/output_editor/temp_control_output.jinja2
similarity index 70%
rename from octoprint_enclosure/templates/output_editor/temp_sensor_output.jinja2
rename to octoprint_enclosure/templates/output_editor/temp_control_output.jinja2
index f83de96..c9d8646 100644
--- a/octoprint_enclosure/templates/output_editor/temp_sensor_output.jinja2
+++ b/octoprint_enclosure/templates/output_editor/temp_control_output.jinja2
@@ -1,20 +1,11 @@
 <form class="form-horizontal">
 
-    <div class="control-group">
-        <label class="control-label">Temperature Sensor</label>
-        <div class="controls">
-          <select data-bind="options: $root.settings_temperature_sensors, optionsText: 'label',
-                        optionsValue: 'index_id', value: $data.linked_temp_sensor">
-          </select>
-          <span class="help-inline">Temperature sensor responsible for geting the value to be used. Configured on the input side of the plugin.</span>
-        </div>
-      </div>
 
       <div class="control-group">
         <label class="control-label">Temperature Sensor</label>
         <div class="controls">
           <select data-bind="options: $root.settings_hum_sensors, optionsText: 'label',
-                        optionsValue: 'index_id', value: $data.linked_temp_sensor">
+                        optionsValue: 'index_id', value: outputEditor.temp_ctr_linked_sensor">
           </select>
           <span class="help-inline">Temperature sensor responsible for getting the value to be used. Configured on the input side of the plugin.</span>
         </div>
@@ -24,22 +15,22 @@
         <label class="control-label">{{ _('Temp Control Type') }}</label>
         <div class="controls">
           <label class="radio">
-            <input type="radio" value="heater" name="option_radio_box" data-bind="checked: temp_ctr_type"> {{ _('Heater') }}</label>
+            <input type="radio" value="heater" name="option_radio_box" data-bind="checked: outputEditor.temp_ctr_type"> {{ _('Heater') }}</label>
         </div>
         <div class="controls">
           <label class="radio">
-            <input type="radio" value="cooler" name="option_radio_box" data-bind="checked: temp_ctr_type"> {{ _('Cooler') }}</label>
+            <input type="radio" value="cooler" name="option_radio_box" data-bind="checked: outputEditor.temp_ctr_type"> {{ _('Cooler') }}</label>
         </div>
         <div class="controls">
           <label class="radio">
-            <input type="radio" value="dehumidifier" name="option_radio_box" data-bind="checked: temp_ctr_type"> {{ _('Dehumidifier') }}</label>
+            <input type="radio" value="dehumidifier" name="option_radio_box" data-bind="checked: outputEditor.temp_ctr_type"> {{ _('Dehumidifier') }}</label>
         </div>
       </div>
 
       <div class="control-group">
         <label class="control-label">{{ _('Default Value') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: temp_ctr_default_value">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.temp_ctr_default_value">
           <span class="help-inline">Default temperature / humidity that temperature control will be set when the print starts or the server starts.</span>
         </div>
       </div>
@@ -47,7 +38,7 @@
       <div class="control-group">
         <label class="control-label">{{ _('Value Deadband') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: temp_ctr_deadband">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.temp_ctr_deadband">
           <span class="help-inline">Allowable drift on temperature / humidity control. Set it to zero to disable.</span>
         </div>
       </div>
@@ -55,7 +46,7 @@
       <div class="control-group">
         <label class="control-label">{{ _('Maximum Temperature') }}</label>
         <div class="controls">
-          <input type="text" class="input-block-level" data-bind="value: temp_ctr_max_temp">
+          <input type="text" class="input-block-level" data-bind="value: outputEditor.temp_ctr_max_temp">
           <span class="help-inline">Maximum temperature that the enclosure should reach, if this temperature is hit, the heater will be disabled until
             it's set temperature is set again.</span>
         </div>