diff --git a/templates/_partials/form-fields.tpl b/templates/_partials/form-fields.tpl
index ce2d197..acaf6ee 100644
--- a/templates/_partials/form-fields.tpl
+++ b/templates/_partials/form-fields.tpl
@@ -30,13 +30,13 @@
 
 {else}
 
-  <div class="form-group row {if !empty($field.errors)}has-error{/if} flex flex-col">
+  <div class="form-group {if !empty($field.errors)}has-error{/if} flex flex-col">
     <label class="font-medium form-control-label{if $field.required} required{/if} mb-1">
       {if $field.type !== 'checkbox'}
         {$field.label}
       {/if}
     </label>
-    <div class="col-md-6{if ($field.type === 'radio-buttons')} form-control-valign{/if}">
+    <div class="flex flex-col {if ($field.type === 'radio-buttons')} items-center{/if}">
 
       {if $field.type === 'select'}
 
@@ -87,9 +87,9 @@
       {elseif $field.type === 'checkbox'}
 
         {block name='form_field_item_checkbox'}
-          <span class="custom-checkbox">
-            <label class="font-light text-sm">
-              <input name="{$field.name}" type="checkbox" value="1" {if $field.value}checked="checked"{/if} {if $field.required}required{/if}>
+          <span class="custom-checkbox flex gap-2">
+            <input class="my-0.5" name="{$field.name}" type="checkbox" value="1" {if $field.value}checked="checked"{/if} {if $field.required}required{/if}>
+            <label class="font-light text-sm" for="{$field.name}">
               {$field.label nofilter}
             </label>
           </span>
diff --git a/templates/checkout/_partials/steps/checkout-step.tpl b/templates/checkout/_partials/steps/checkout-step.tpl
index e98b29b..b02f911 100644
--- a/templates/checkout/_partials/steps/checkout-step.tpl
+++ b/templates/checkout/_partials/steps/checkout-step.tpl
@@ -32,7 +32,7 @@
                         'js-current-step' => $step_is_current
                     ]|classnames}"
   >
-    <div class="step-title font-semibold p-2 border border-gray-800">
+    <div class="step-title font-semibold p-2 border border-gray-800 flex gap-2 items-center ">
       <i class="ti ti-square"></i>
       <span class="step-number">{$position}</span>
       {$title}
diff --git a/templates/checkout/_partials/steps/unreachable.tpl b/templates/checkout/_partials/steps/unreachable.tpl
index 55a6f21..6ecefb8 100644
--- a/templates/checkout/_partials/steps/unreachable.tpl
+++ b/templates/checkout/_partials/steps/unreachable.tpl
@@ -24,7 +24,7 @@
  *}
 {block name='step'}
   <section class="checkout-step -unreachable" id="{$identifier}">
-    <div class="step-title font-semibold p-2 border border-gray-800">
+    <div class="step-title font-semibold p-2 border border-gray-800 flex gap-2 items-center ">
       <i class="ti ti-lock-square"></i>
       <span class="step-number">{$position}</span>
       {$title}