diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig
index fbf856ac..33a0d795 100644
--- a/templates/warranty/form.html.twig
+++ b/templates/warranty/form.html.twig
@@ -183,41 +183,46 @@
                                     </div>
                                 </div>
                                 <div class="form-group m-form__group row">
-                                    <div class="col-lg-6">
-                                        <label data-field="sender_name">
-                                            Sender Name
-                                        </label>
-                                        <input type="text" name="sender_name" class="form-control m-input" value="{{ obj.getSenderName }}" data-name="sender_name">
-                                        <div class="form-control-feedback hide" data-field="sender_name"></div>
-                                    </div>
-                                    <div class="col-lg-6">
-                                        <label data-field="sender_contact_number">
+                                    <div class="col-lg-4">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="sender_name">
+                                                Sender Name
+                                            </label>
+                                            <input type="text" name="sender_name" class="form-control m-input" value="{{ obj.getSenderName }}" data-name="sender_name">
+                                            <div class="form-control-feedback hide" data-field="sender_name"></div>
+                                        </div>
+                                        <br>
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="sender_contact_number">
                                                 Sender Contact Number
-                                        </label>
-                                        <input type="text" name="sender_contact_number" class="form-control m-input" value="{{ obj.getSenderContactNumber }}" data-name="sender_contact_number">
-                                        <div class="form-control-feedback hide" data-field="sender_contact_number"></div>
+                                            </label>
+                                            <input type="text" name="sender_contact_number" class="form-control m-input" value="{{ obj.getSenderContactNumber }}" data-name="sender_contact_number">
+                                            <div class="form-control-feedback hide" data-field="sender_contact_number"></div> 
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="form-group m-form__group row">
                                     <div class="col-lg-4">
-                                        <label data-field="outlet_name">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="outlet_name">
                                                 Outlet Name
-                                        </label>
-                                        <input type="text" name="outlet_name" class="form-control m-input" value="{{ obj.getOutletName }}" data-name="outlet_name">
-                                        <div class="form-control-feedback hide" data-field="outlet_name"></div>
-                                    </div>
-                                    <div class="col-lg-4">
-                                        <label data-field="outlet_contact_number">
+                                            </label>
+                                            <input type="text" name="outlet_name" class="form-control m-input" value="{{ obj.getOutletName }}" data-name="outlet_name">
+                                            <div class="form-control-feedback hide" data-field="outlet_name"></div>
+                                        </div>
+                                        <br>
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="outlet_contact_number">
                                                 Outlet Contact Number
-                                        </label>
-                                        <input type="text" name="outlet_contact_number" class="form-control m-input" value="{{ obj.getOutletContactNumber }}" data-name="outlet_contact_number">
-                                        <div class="form-control-feedback hide" data-field="outlet_contact_number"></div>
+                                            </label>
+                                            <input type="text" name="outlet_contact_number" class="form-control m-input" value="{{ obj.getOutletContactNumber }}" data-name="outlet_contact_number">
+                                            <div class="form-control-feedback hide" data-field="outlet_contact_number"></div>
+                                        </div>
                                     </div>
                                     <div class="col-lg-4">
-                                        <label data-field="outlet_address">
-                                            Outlet Address
-                                        </label>
-                                        <textarea name="outlet_address" class="form-control m-input" data-name="outlet_address" rows="4">{{ obj.getOutletAddress }}</textarea>
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label data-field="outlet_address">
+                                                Outlet Address
+                                            </label>
+                                            <textarea name="outlet_address" class="form-control m-input" data-name="outlet_address" rows="6">{{ obj.getOutletAddress }}</textarea>
                                             <div class="form-control-feedback hide" data-field="outlet_address"></div>
                                         </div>
                                     </div>