diff --git a/addon/components/utils/address-form.hbs b/addon/components/utils/address-form.hbs
index dd6163fe..5c65eef1 100644
--- a/addon/components/utils/address-form.hbs
+++ b/addon/components/utils/address-form.hbs
@@ -53,44 +53,45 @@
       {{/if}}
     </div>
   {{/unless}}
-
-  <div class="fx-col fx-gap-px-6">
-    <label {{required-input}}>
-      {{t "upf_utils.address_form.line_1"}}
-    </label>
-    {{#if this.useGoogleAutocomplete}}
-      <div class="fx-col google-autocomplete-input-container" data-control-name="address-form-address1">
-        <Input
+  <div class="fx-row fx-gap-px-12">
+    <div class="fx-col fx-gap-px-6 fx-1">
+      <label {{required-input}}>
+        {{t "upf_utils.address_form.line_1"}}
+      </label>
+      {{#if this.useGoogleAutocomplete}}
+        <div class="fx-col google-autocomplete-input-container" data-control-name="address-form-address1">
+          <Input
+            @value={{get @address (concat this.addressKey "1")}}
+            class="upf-input"
+            placeholder={{t "upf_utils.address_form.placeholder.line1"}}
+            {{did-insert this.initAutoCompletion}}
+            {{on "keyup" (fn this.onFieldUpdate (concat this.addressKey "1"))}}
+            {{(if (eq @focus "line1") (modifier "enable-input-autofocus"))}}
+          />
+        </div>
+      {{else}}
+        <OSS::InputContainer
           @value={{get @address (concat this.addressKey "1")}}
-          class="upf-input"
-          placeholder={{t "upf_utils.address_form.placeholder.line1"}}
-          {{did-insert this.initAutoCompletion}}
-          {{on "keyup" (fn this.onFieldUpdate (concat this.addressKey "1"))}}
+          @onChange={{fn this.onFieldUpdate (concat this.addressKey "1")}}
+          @placeholder={{t "upf_utils.address_form.placeholder.line1"}}
+          data-control-name="address-form-address1"
           {{(if (eq @focus "line1") (modifier "enable-input-autofocus"))}}
         />
-      </div>
-    {{else}}
+      {{/if}}
+    </div>
+
+    <div class="fx-col fx-gap-px-6 fx-1">
+      <label>
+        {{t "upf_utils.address_form.line_2"}}
+      </label>
       <OSS::InputContainer
-        @value={{get @address (concat this.addressKey "1")}}
-        @onChange={{fn this.onFieldUpdate (concat this.addressKey "1")}}
-        @placeholder={{t "upf_utils.address_form.placeholder.line1"}}
-        data-control-name="address-form-address1"
-        {{(if (eq @focus "line1") (modifier "enable-input-autofocus"))}}
+        @value={{get @address (concat this.addressKey "2")}}
+        @onChange={{fn this.onFieldUpdate (concat this.addressKey "2")}}
+        @placeholder={{t "upf_utils.address_form.placeholder.line2"}}
+        data-control-name="address-form-address2"
+        {{(if (eq @focus "line2") (modifier "enable-input-autofocus"))}}
       />
-    {{/if}}
-  </div>
-
-  <div class="fx-col fx-gap-px-6">
-    <label>
-      {{t "upf_utils.address_form.line_2"}}
-    </label>
-    <OSS::InputContainer
-      @value={{get @address (concat this.addressKey "2")}}
-      @onChange={{fn this.onFieldUpdate (concat this.addressKey "2")}}
-      @placeholder={{t "upf_utils.address_form.placeholder.line2"}}
-      data-control-name="address-form-address2"
-      {{(if (eq @focus "line2") (modifier "enable-input-autofocus"))}}
-    />
+    </div>
   </div>
 
   <div class="fx-row fx-gap-px-12">
@@ -157,4 +158,4 @@
       />
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file