diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css
index d7b5406..c260687 100644
--- a/octoprint_klipper/static/css/klipper.css
+++ b/octoprint_klipper/static/css/klipper.css
@@ -136,6 +136,10 @@ ul#klipper-settings {
   flex: 3 auto;
 }
 
+.klipper-noresize {
+  resize: none;
+}
+
 .gap {
   justify-content: space-evenly;
 }
diff --git a/octoprint_klipper/templates/klipper_param_macro_dialog.jinja2 b/octoprint_klipper/templates/klipper_param_macro_dialog.jinja2
index cfdd17d..8124357 100644
--- a/octoprint_klipper/templates/klipper_param_macro_dialog.jinja2
+++ b/octoprint_klipper/templates/klipper_param_macro_dialog.jinja2
@@ -15,7 +15,7 @@
             <!-- /ko -->
             <!-- ko if: !$data.hasOwnProperty("options") -->
             <div class="input-append">
-               <input type="text" class="input-block-level span2" data-bind="value: value">
+               <input type="text" class="span2" data-bind="value: value">
                <span class="add-on" data-bind="text: unit"></span>
             </div>
             <!-- /ko -->
diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2
index 2dd5939..7ca0136 100644
--- a/octoprint_klipper/templates/klipper_settings.jinja2
+++ b/octoprint_klipper/templates/klipper_settings.jinja2
@@ -168,12 +168,14 @@
         </span>
       </div>
       <div class="control-group">
-        <pre>
-          PID_CALIBRATE
-          HEATER={label:Heater, default:extruder, options:extruder|extruder1}
-          TARGET={label:Target Temperature, unit:°C, default:190}
-          WRITE_FILE={label:Write to File, default:0, options:0|1}
-        </pre>
+        <label class="control-label">{{ _('Command') }}</label>
+        <div class="controls" style="margin-left: 82px;">
+          <div class="row-fluid">
+            <div class="span12" style="margin-top:2px;">
+              <textarea rows="2" class="block klipper-noresize">PID_CALIBRATE HEATER={label:Heater, default:extruder, options:extruder|extruder1} TARGET={label:Target Temperature, unit:°C, default:190} WRITE_FILE={label:Write to File, default:0, options:0|1}</textarea>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <!-- Leveling -->