diff --git a/octoprint_enclosure/templates/enclosure_settings.jinja2 b/octoprint_enclosure/templates/enclosure_settings.jinja2
index 7db8ede..f76a0bd 100644
--- a/octoprint_enclosure/templates/enclosure_settings.jinja2
+++ b/octoprint_enclosure/templates/enclosure_settings.jinja2
@@ -2,4 +2,13 @@
 
 {% include "output_table.jinja2" %}
 
-{% include "output_editor/main_screen.jinja2" %}
\ No newline at end of file
+{% include "output_editor/main_screen.jinja2" %}
+
+<h4>{{ _('Raspberry Pi Inputs') }}</h4>
+
+{% include "input_table.jinja2" %}
+
+{% include "input_editor/main_screen.jinja2" %}
+
+
+<button class="btn pull-right" data-bind="click: function() { $root.print_data(); }">Test</button>
\ No newline at end of file
diff --git a/octoprint_enclosure/templates/input_folder/general_info.jinja2 b/octoprint_enclosure/templates/input_editor/general_info.jinja2
similarity index 85%
rename from octoprint_enclosure/templates/input_folder/general_info.jinja2
rename to octoprint_enclosure/templates/input_editor/general_info.jinja2
index 031a445..656cf53 100644
--- a/octoprint_enclosure/templates/input_folder/general_info.jinja2
+++ b/octoprint_enclosure/templates/input_editor/general_info.jinja2
@@ -26,21 +26,21 @@
     </div>
     <div class="control-group">
       <div class="controls">
-        <!-- ko if: (outputEditor.input_type() == "regular_gpio")  -->
+        <!-- kocomment if: (outputEditor.input_type() == "regular_gpio")  -->
         <span class="help-inline">
           <span class="label label-info">Info:</span> GPIO will input status of the pin (HIGH or LOW) to trigger actions on configured outputs or printer events</span>
-        <!-- /ko -->
-        <!-- ko if: (outputEditor.input_type() == "temperature_sensor")  -->
+        <!-- /kocomment -->
+        <!-- kocomment if: (outputEditor.input_type() == "temperature_sensor")  -->
         <span class="help-inline">
           <span class="label label-info">Info:</span> Temperature Sensors will input temperature and humidity data.
         </span>
-        <!-- /ko -->
+        <!-- /kocomment -->
       </div>
     </div>
   </div>
 
 
-  <!-- ko if: (outputEditor.input_type() == "regular_gpio")  -->
+  <!-- kocomment if: (outputEditor.input_type() == "regular_gpio")  -->
   <div class="control-group">
     <label class="control-label">{{ _('Action Type') }}</label>
     <div class="controls">
@@ -50,7 +50,7 @@
       <input type="radio" value="printer_control" data-bind="checked: action_type"> {{ _('Printer') }}
     </div>
   </div>
-  <!-- /ko -->
+  <!-- /kocomment -->
 
 
 
diff --git a/octoprint_enclosure/templates/input_folder/io_output.jinja2 b/octoprint_enclosure/templates/input_editor/io_output.jinja2
similarity index 100%
rename from octoprint_enclosure/templates/input_folder/io_output.jinja2
rename to octoprint_enclosure/templates/input_editor/io_output.jinja2
diff --git a/octoprint_enclosure/templates/input_folder/main_screen.jinja2 b/octoprint_enclosure/templates/input_editor/main_screen.jinja2
similarity index 84%
rename from octoprint_enclosure/templates/input_folder/main_screen.jinja2
rename to octoprint_enclosure/templates/input_editor/main_screen.jinja2
index 0d855b6..b89e373 100644
--- a/octoprint_enclosure/templates/input_folder/main_screen.jinja2
+++ b/octoprint_enclosure/templates/input_editor/main_screen.jinja2
@@ -27,24 +27,24 @@
 
             <div class="tab-content">
                 <div id="settings_inputs_edit_dialog_general" class="tab-pane active">
-                    {% include "input_folder/general_info.jinja2" %}
+                    <!-- {% include "input_folder/general_info.jinja2" %} -->
                 </div>
 
                 <div id="settings_inputs_edit_dialog_io" class="tab-pane">
-                    {% include "input_folder/io_output.jinja2" %}
+                    <!-- {% include "input_folder/io_output.jinja2" %} -->
                 </div>
 
                 <div id="settings_inputs_edit_dialog_printer_action" class="tab-pane">
-                    {% include "input_folder/printer_action.jinja2" %}
+                    <!-- {% include "input_folder/printer_action.jinja2" %} -->
                 </div>
 
                 <div id="settings_inputs_edit_dialog_output_action" class="tab-pane">
-                    {% include "input_folder/output_action.jinja2" %}
+                    <!-- {% include "input_folder/output_action.jinja2" %} -->
                 </div>
 
                  <!-- ko if: ($data.input_type() == "temperature_sensor")  -->
                 <div id="settings_inputs_edit_dialog_temperature_sensor" class="tab-pane">
-                    {% include "input_folder/temperature_sensor.jinja2" %}
+                    <!-- {% include "input_folder/temperature_sensor.jinja2" %} -->
                 </div>
                 <!-- /ko -->
 
diff --git a/octoprint_enclosure/templates/input_folder/output_action.jinja2 b/octoprint_enclosure/templates/input_editor/output_action.jinja2
similarity index 100%
rename from octoprint_enclosure/templates/input_folder/output_action.jinja2
rename to octoprint_enclosure/templates/input_editor/output_action.jinja2
diff --git a/octoprint_enclosure/templates/input_folder/printer_action.jinja2 b/octoprint_enclosure/templates/input_editor/printer_action.jinja2
similarity index 100%
rename from octoprint_enclosure/templates/input_folder/printer_action.jinja2
rename to octoprint_enclosure/templates/input_editor/printer_action.jinja2
diff --git a/octoprint_enclosure/templates/input_folder/temperature_sensor.jinja2 b/octoprint_enclosure/templates/input_editor/temperature_sensor.jinja2
similarity index 100%
rename from octoprint_enclosure/templates/input_folder/temperature_sensor.jinja2
rename to octoprint_enclosure/templates/input_editor/temperature_sensor.jinja2
diff --git a/octoprint_enclosure/templates/input_table.jinja2 b/octoprint_enclosure/templates/input_table.jinja2
index e69de29..1def2a4 100644
--- a/octoprint_enclosure/templates/input_table.jinja2
+++ b/octoprint_enclosure/templates/input_table.jinja2
@@ -0,0 +1,33 @@
+<table class="table table-striped table-hover table-condensed table-hover" id="settings_enclosure_inputs" style="">
+    <thead>
+      <tr>
+        <th class="">Id</th>
+        <th class="">Label</th>
+        <th class="">Type</th>
+        <th class="">GPIO</th>
+        <th class="">{{ _('Action') }}</th>
+      </tr>
+    </thead>
+    <tbody data-bind="foreach: $root.enclosureInputs">
+      <tr data-bind="attr: {title: name}">
+        <td class="" data-bind="text: index_id"></td>
+        <td class="" data-bind="text: label"></td>
+        <td class="" data-bind="text: input_type"></td>
+        <!-- ko if: gpio.pin_name  -->
+        <td class="" data-bind="text: gpio.pin_name"></td>
+        <!-- /ko -->
+        <!-- ko ifnot: (gpio.pin_name ) -->
+        <td class="" >N/A</td>
+        <!-- /ko -->
+        <td class="">
+          <a href="#" class="fa fa-pencil" title="{{ _('Edit Output')|edq }}" data-bind="click: function() { $root.showInputEditorDialog($data); }"></a>&nbsp;|&nbsp;
+          <a href="#" class="fa fa-trash-o" title="{{ _('Delete Output')|edq }}" data-bind="click: function() { $root.removeInput($data); }"></a>
+      </td>
+      </tr>
+    </tbody>
+  </table>
+  
+  <div class="control-group">
+    <button class="btn pull-right" data-bind="click: function() { $root.showInputEditorDialog(); }">Add
+      Inputs...</button>
+  </div>
\ No newline at end of file
diff --git a/octoprint_enclosure/templates/output_table.jinja2 b/octoprint_enclosure/templates/output_table.jinja2
index b80d7f0..631cf50 100644
--- a/octoprint_enclosure/templates/output_table.jinja2
+++ b/octoprint_enclosure/templates/output_table.jinja2
@@ -30,6 +30,4 @@
 <div class="control-group">
   <button class="btn pull-right" data-bind="click: function() { $root.showOutputEditorDialog(); }">Add
     Outputs...</button>
-</div>
-
-<button class="btn pull-right" data-bind="click: function() { $root.print_data(); }">Test</button>
\ No newline at end of file
+</div>
\ No newline at end of file