diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__router/os__neutron__router.html b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__router/os__neutron__router.html
index 002529fa..9589c203 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__router/os__neutron__router.html
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__router/os__neutron__router.html
@@ -19,61 +19,6 @@
                 </md-select>
             </md-input-container>
 
-            <div layout-gt-xs="row" >
-                <md-input-container class="md-block" flex-gt-xs>
-                    <md-checkbox ng-model="$ctrl.router.admin_state_up" aria-label="admin_state_up">
-                      Admin State UP
-                    </md-checkbox>
-                </md-input-container>
-            </div>
-
-            <md-switch class="md-primary" name="show_more" ng-model="show_more">
-              {$ 'Show More Properties' | translate $}
-            </md-switch>
-
-        </md-content>
-    </md-tab>
-    <md-tab label="More Properties" ng-if="show_more">
-        <md-content layout-padding>
-
-            <div layout-gt-xs="row" >
-                <md-input-container class="md-block" flex-gt-xs>
-                    <md-checkbox ng-model="$ctrl.router.external_gateway_info.enable_snat" aria-label="enable_snat">
-                      Enable SNAT
-                    </md-checkbox>
-                </md-input-container>
-                <md-input-container class="md-block" flex-gt-xs>
-                    <md-checkbox ng-model="$ctrl.router.distributed" aria-label="distributed">
-                      Distributed
-                    </md-checkbox>
-                </md-input-container>
-
-                <md-input-container class="md-block" flex-gt-xs>
-                    <md-checkbox ng-model="$ctrl.router.ha" aria-label="ha">
-                      HA
-                    </md-checkbox>
-                </md-input-container>
-            </div>
-
-            <md-input-container class="md-block" flex-gt-xs>
-                <label>L3 Agents</label>
-                <md-chips ng-model="$ctrl.router.l3_agent_ids"
-                          placeholder="+ l3 agent id"
-                          readonly="false"
-                          md-removeable="true"
-                          md-max-chips="255">
-                </md-chips>
-            </md-input-container>
-            <md-input-container class="md-block" flex-gt-xs>
-                <label>Tags</label>
-                <md-chips ng-model="$ctrl.router.tags"
-                          placeholder="+ tags"
-                          readonly="false"
-                          md-removeable="true"
-                          md-max-chips="255">
-                </md-chips>
-            </md-input-container>
-
             <label>External Fixed IP Addresses</label>
             <md-button ng-click="$ctrl.add_external_fixed_ip()" aria-label="Add" class="md-icon-button"><i class="fa fa-fw fa-plus"></i></md-button>
 
@@ -98,6 +43,63 @@
                 </div>
             </div>
 
+
+            <div layout-gt-xs="row" >
+                <md-input-container class="md-block" flex-gt-xs>
+                    <md-checkbox ng-model="$ctrl.router.admin_state_up" aria-label="admin_state_up">
+                      Admin State UP
+                    </md-checkbox>
+                </md-input-container>
+                <md-input-container class="md-block" flex-gt-xs>
+                    <md-checkbox ng-model="$ctrl.router.external_gateway_info.enable_snat" aria-label="enable_snat">
+                      Enable SNAT
+                    </md-checkbox>
+                </md-input-container>
+            </div>
+
+            <md-switch class="md-primary" name="show_more" ng-model="show_more">
+              {$ 'Show More Properties' | translate $}
+            </md-switch>
+
+        </md-content>
+    </md-tab>
+    <md-tab label="More Properties" ng-if="show_more">
+        <md-content layout-padding>
+
+            <div layout-gt-xs="row" >
+                <md-input-container class="md-block" flex-gt-xs>
+                    <md-checkbox ng-model="$ctrl.router.distributed" aria-label="distributed">
+                      Distributed
+                    </md-checkbox>
+                </md-input-container>
+
+                <md-input-container class="md-block" flex-gt-xs>
+                    <md-checkbox ng-model="$ctrl.router.ha" aria-label="ha">
+                      HA
+                    </md-checkbox>
+                </md-input-container>
+            </div>
+
+            <md-input-container class="md-block" flex-gt-xs>
+                <label>L3 Agents</label>
+                <md-chips ng-model="$ctrl.router.l3_agent_ids"
+                          placeholder="+ l3 agent id"
+                          readonly="false"
+                          md-removeable="true"
+                          md-max-chips="255">
+                </md-chips>
+            </md-input-container>
+
+            <md-input-container class="md-block" flex-gt-xs>
+                <label>Tags</label>
+                <md-chips ng-model="$ctrl.router.tags"
+                          placeholder="+ tags"
+                          readonly="false"
+                          md-removeable="true"
+                          md-max-chips="255">
+                </md-chips>
+            </md-input-container>
+
             <label>Value Specs</label>
             <md-button ng-click="$ctrl.add_value_specs()" aria-label="Add" class="md-icon-button"><i class="fa fa-fw fa-plus"></i></md-button>
             <div ng-repeat="record in $ctrl.router.value_specs" ng-class-odd="'odd'" ng-class-even="'even'">