diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index 7437a8eb..c9b6288a 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -138,8 +138,8 @@ $(function() {
                 return control;
             }
 
-            if (control.hasOwnProperty("template") && control.hasOwnProperty("key") && control.hasOwnProperty("deflt") && control.hasOwnProperty("template_key") && !control.hasOwnProperty("output")) {
-                control.output = ko.observable(control.deflt);
+            if (control.hasOwnProperty("template") && control.hasOwnProperty("key") && control.hasOwnProperty("defaultValue") && control.hasOwnProperty("template_key") && !control.hasOwnProperty("output")) {
+                control.output = ko.observable(control.defaultValue);
                 if (!self.feedbackControlLookup.hasOwnProperty(control.key)) {
                     self.feedbackControlLookup[control.key] = {};
                 }
@@ -158,7 +158,7 @@ $(function() {
 
             if (control.hasOwnProperty("input")) {
                 for (var i = 0; i < control.input.length; i++) {
-                    control.input[i].value = ko.observable(control.input[i].default);
+                    control.input[i].value = ko.observable(control.input[i].defaultValue);
                     if (!control.input[i].hasOwnProperty("slider")) {
                         control.input[i].slider = false;
                     }
diff --git a/src/octoprint/templates/tabs/control.jinja2 b/src/octoprint/templates/tabs/control.jinja2
index 37dbc5d7..f5f7a926 100644
--- a/src/octoprint/templates/tabs/control.jinja2
+++ b/src/octoprint/templates/tabs/control.jinja2
@@ -160,7 +160,8 @@
     </form>
 </script>
 <script type="text/html" id="customControls_controlTemplate_input">
-    <!-- ko foreach: input -->
+    <!-- ko foreach: input -->
+    <div class="form-inline">
         <label style="cursor: default" data-bind="text: name"></label>
         <!-- ko if: slider -->
             <input type="number" style="width: 100px" data-bind="slider: {value: value, min: slider.min, max: slider.max, step: slider.step}">
@@ -168,6 +169,7 @@
         <!-- ko ifnot: slider -->
             <input type="text" class="input-small" data-bind="attr: {placeholder: name}, value: value">
         <!-- /ko -->
+    </div>
     <!-- /ko -->
 </script>
 <script type="text/html" id="customControls_controlTemplate_output">