diff --git a/octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2 b/octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2
index cb38499..c1744ac 100644
--- a/octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2
+++ b/octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2
@@ -5,16 +5,16 @@
     </div>
     <div class="modal-body">
        <div class="control-group">
-         <label class="control-label">{{ _('Heater Index') }</label>
+         <label class="control-label">{{ _('Heater Index') }}</label>
          <div class="controls">
            <div class="input-append">
               <input type="text" class="input-block-level span2" data-bind="value: heaterIndex">
-              <span class="add-on">{{ _('index') }</span>
+              <span class="add-on">{{ _('index') }}</span>
            </div>
          </div>
        </div>
        <div class="control-group">
-         <label class="control-label">{{ _('Target Temperature') }</label>
+         <label class="control-label">{{ _('Target Temperature') }}</label>
          <div class="controls">
             <div class="input-append">
                <input type="text" class="input-block-level span2" data-bind="value: targetTemperature">
@@ -22,11 +22,11 @@
             </div>
          </div>
        </div>
-       <label class="control-label">{{ _('The result of the tuning cycle is reported in the terminal.') }</label>
+       <label class="control-label">{{ _('The result of the tuning cycle is reported in the terminal.') }}</label>
        <div class="control-group">
          <div class="controls">
-             <button class="btn btn-block" data-bind="click: startTuning" data-dismiss="modal"><i class="icon-fire"></i> {{ _('Start Tuning') }</button>
+             <button class="btn btn-block" data-bind="click: startTuning" data-dismiss="modal"><i class="icon-fire"></i> {{ _('Start Tuning') }}</button>
          </div>
        </div>
    </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2
index a8d07fb..3d5a44c 100644
--- a/octoprint_klipper/templates/klipper_settings.jinja2
+++ b/octoprint_klipper/templates/klipper_settings.jinja2
@@ -17,9 +17,9 @@
     <div class="control-group">
        <div class="controls">
           <div class="row-fluid">
-            <div class="span8" style="text-align: right"><small>{ _('Add macro button to:') }}</small></div>
-            <div class="span1"><small>{ _('Klipper Tab') }}</small></div>
-            <div class="span2"><small>{ _('Sidebar') }}</small></div>
+            <div class="span8" style="text-align: right"><small>{{ _('Add macro button to:') }}</small></div>
+            <div class="span1"><small>{{ _('Klipper Tab') }}</small></div>
+            <div class="span2"><small>{{ _('Sidebar') }}</small></div>
           </div>
        </div>
     </div>
@@ -58,7 +58,7 @@
     </div>
     <div class="control-group">
       <div class="controls">
-        <a href='#' data-bind='click: addMacro' class="fa fa-plus-circle"></a> {{ _('Add Macro') }
+        <a href='#' data-bind='click: addMacro' class="fa fa-plus-circle"></a> {{ _('Add Macro') }}
       </div>
     </div>
     
@@ -129,7 +129,7 @@
    </div>
    <div class="control-group">
      <div class="controls">
-       <a href='#' data-bind='click: addProbePoint' class="fa fa-plus-circle"></a> { _('Add Point') }}
+       <a href='#' data-bind='click: addProbePoint' class="fa fa-plus-circle"></a>{{ _('Add Point') }}
      </div>
    </div>
 </form>