             template:
                 """
                 <div class="row m-b">
-                        <label class="col-sm-12 control-label" for="{{formName+index}}" ng-class="{'fb-required':required}">{{label}}</label>
+                        <label class="col-sm-2 control-label" for="{{formName+index}}" ng-class="{'fb-required':required}">{{label}}</label>
                     </label>
 
-                    <div ng-if="!readOnly" class="col-sm-12">
-                        <input type="text" ng-model="$parent.inputText.StreetName" class="form-control custom-m-b" placeholder="Street Name"/>
-                        <input type="text" ng-model="$parent.inputText.Number" class="form-control custom-m-b" placeholder="Number"/>
-                        <input type="text" ng-model="$parent.inputText.Letter" class="form-control custom-m-b" placeholder="Letter"/>
-                        <input type="text" ng-model="$parent.inputText.Floor" class="form-control custom-m-b" placeholder="Floor"/>
-                        <input type="text" ng-model="$parent.inputText.PlaceName" class="form-control custom-m-b" placeholder="Place Name"/>
-                        <input type="text" ng-model="$parent.inputText.PostCode" class="form-control custom-m-b" placeholder="Post Code"/>
-                        <input type="text" ng-model="$parent.inputText.City" id="{{formName+index}}" class="form-control custom-m-b" placeholder="City" validator-required={{required}} validator-group={{formName}}/>
-                    </div>
-                    <div ng-if="readOnly" class="col-sm-12">
-                        <input type="text" ng-model="$parent.inputText.StreetName" class="form-control custom-m-b" placeholder="Street Name" disabled/>
-                        <input type="text" ng-model="$parent.inputText.Number" class="form-control custom-m-b" placeholder="Number" disabled/>
-                        <input type="text" ng-model="$parent.inputText.Letter" class="form-control custom-m-b" placeholder="Letter" disabled/>
-                        <input type="text" ng-model="$parent.inputText.Floor" class="form-control custom-m-b" placeholder="Floor" disabled/>
-                        <input type="text" ng-model="$parent.inputText.PlaceName" class="form-control custom-m-b" placeholder="Place Name" disabled/>
-                        <input type="text" ng-model="$parent.inputText.PostCode" class="form-control custom-m-b" placeholder="Post Code" disabled/>
-                        <input type="text" ng-model="$parent.inputText.City" id="{{formName+index}}" class="form-control custom-m-b" placeholder="City" validator-required={{required}} validator-group={{formName}} disabled/>
+                    <div ng-if="!readOnly" class="col-sm-10">
+                        <input type="text" ng-model="$parent.inputText.StreetName" class="form-control m-b" placeholder="Street Name"/>
+                        <input type="text" ng-model="$parent.inputText.Number" class="form-control m-b" placeholder="Number"/>
+                        <input type="text" ng-model="$parent.inputText.Letter" class="form-control m-b" placeholder="Letter"/>
+                        <input type="text" ng-model="$parent.inputText.Floor" class="form-control m-b" placeholder="Floor"/>
+                        <input type="text" ng-model="$parent.inputText.PlaceName" class="form-control m-b" placeholder="Place Name"/>
+                        <input type="text" ng-model="$parent.inputText.PostCode" class="form-control m-b" placeholder="Post Code"/>
+                        <input type="text" ng-model="$parent.inputText.City" id="{{formName+index}}" class="form-control m-b" placeholder="City" validator-required={{required}} validator-group={{formName}}/>
+                    </div>
+                    <div ng-if="readOnly" class="col-sm-10">
+                        <input type="text" ng-model="$parent.inputText.StreetName" class="form-control m-b" placeholder="Street Name" disabled/>
+                        <input type="text" ng-model="$parent.inputText.Number" class="form-control m-b" placeholder="Number" disabled/>
+                        <input type="text" ng-model="$parent.inputText.Letter" class="form-control m-b" placeholder="Letter" disabled/>
+                        <input type="text" ng-model="$parent.inputText.Floor" class="form-control m-b" placeholder="Floor" disabled/>
+                        <input type="text" ng-model="$parent.inputText.PlaceName" class="form-control m-b" placeholder="Place Name" disabled/>
+                        <input type="text" ng-model="$parent.inputText.PostCode" class="form-control m-b" placeholder="Post Code" disabled/>
+                        <input type="text" ng-model="$parent.inputText.City" id="{{formName+index}}" class="form-control m-b" placeholder="City" validator-required={{required}} validator-group={{formName}} disabled/>
                     </div>
                     <div class="col-sm-12">
                         <small class="help-block text-muted custom-small">{{description}}</small>
                     </div>
+                    <div class="hr-line-dashed"></div>
                 </div>
                 """
             popoverTemplate:

                template:
                    """
                    <div class="row m-b">
                            <label class="col-sm-12 control-label" for="{{formName+index}}" ng-class="{'fb-required':required}">{{label}}</label>
                        </label>
                        <div class="col-sm-12">
                            <div class="custom-m-b">
                                <signature-pad></signature-pad>
                            </div>
                        </div>
                        <div class="col-sm-12">
                            <small class="help-block text-muted custom-small"></small>
                        </div>
                    </div>
                    """
                popoverTemplate:

                    </div>
                    <p class='help-block'>{{description}}</p>
                </div>
                <div class="hr-line-dashed"></div>
            </div>
            """
        popoverTemplate:
