diff --git a/src/scss/core/components/_search.scss b/src/scss/core/components/_search.scss
index 43ed5dc67..ce0b6fe9d 100644
--- a/src/scss/core/components/_search.scss
+++ b/src/scss/core/components/_search.scss
@@ -99,8 +99,7 @@ $component-name: search;
 
     &__results {
       max-height: 20rem;
-      padding: 0.5rem;
-      padding-right: 1.5rem;
+      padding: 0.5rem 1.5rem 0.5rem 0.5rem;
       margin: 0;
       overflow-y: scroll;
     }
diff --git a/src/scss/core/layout/_header.scss b/src/scss/core/layout/_header.scss
index 7ee00fa0f..99075b4c4 100644
--- a/src/scss/core/layout/_header.scss
+++ b/src/scss/core/layout/_header.scss
@@ -13,7 +13,7 @@ $component-name: header;
   max-width: 100vw;
   background-color: var(--header-bg);
 
-  a:not(.dropdown-item) {
+  a:not(.dropdown-item):not(.btn) {
     color: var(--header-color);
 
     &:hover {
diff --git a/templates/_partials/form-fields.tpl b/templates/_partials/form-fields.tpl
index f8b98dede..9f637369f 100644
--- a/templates/_partials/form-fields.tpl
+++ b/templates/_partials/form-fields.tpl
@@ -12,7 +12,7 @@
 
   <div class="mb-3{if !empty($field.errors)} has-error{/if}">
     {if ($field.type !== 'checkbox')}
-      <label class="form-label{if $field.required} required{/if}" for="{$field.name}">
+      <label class="form-label{if $field.required} required{/if}" for="field-{$field.name}">
         {if $field.type !== 'checkbox'}
           {$field.label}
         {/if}
@@ -55,12 +55,12 @@
                 class="form-check-input"
                 type="radio"
                 name="{$field.name}"
-                id="{$field.name}_{$value}"
+                id="field-{$field.name}_{$value}"
                 value="{$value}"
                 {if $field.required}required{/if}
                 {if $value eq $field.value} checked {/if}
               >
-              <label class="form-check-label" for="{$field.name}_{$value}">
+              <label class="form-check-label" for="field-{$field.name}_{$value}">
                 {$label}
               </label>
             </div>
@@ -77,11 +77,11 @@
             name="{$field.name}"
             type="checkbox"
             value="1"
-            id="{$field.name}"
+            id="field-{$field.name}"
             value="1" {if $field.value}checked="checked"{/if}
             {if $field.required}required{/if}
           >
-          <label class="form-check-label" for="{$field.name}">
+          <label class="form-check-label" for="field-{$field.name}">
             {$field.label nofilter}
           </label>
         </div>
@@ -128,7 +128,7 @@
           <input
             class="form-control js-child-focus js-visible-password"
             name="{$field.name}"
-            id="{$field.name}"
+            id="field-{$field.name}"
             type="password"
             {if $field.autocomplete}autocomplete="{$field.autocomplete}"{/if}
             value=""
@@ -159,7 +159,7 @@
         <input
           class="form-control"
           name="{$field.name}"
-          id="{$field.name}"
+          id="field-{$field.name}"
           type="{$field.type}"
           value="{$field.value}"
           {if $field.autocomplete}autocomplete="{$field.autocomplete}"{/if}
diff --git a/templates/customer/_partials/order-messages.tpl b/templates/customer/_partials/order-messages.tpl
index 7680d222e..e5cafc881 100644
--- a/templates/customer/_partials/order-messages.tpl
+++ b/templates/customer/_partials/order-messages.tpl
@@ -13,9 +13,7 @@
               <p class="fw-bold mb-0">{$message.name}</p>
               <p class="fs-6 mb-0">{$message.message_date}</p>
             </div>
-            <div class="col-sm-8">
-              {$message.message nofilter}
-            </div>
+            <div class="col-sm-8">{$message.message nofilter}</div>
           </div> 
         </div>
       {/foreach}