diff --git a/app/less/archetype.less b/app/less/archetype.less
index 285ea9a..0835a78 100644
--- a/app/less/archetype.less
+++ b/app/less/archetype.less
@@ -386,22 +386,6 @@
         }
     }
 
-    .archetypeFieldsetGroups {
-        padding: 0 10px;
-        margin-bottom: 20px;
-        ul {
-            padding: 0;
-            margin: 0;
-
-            li {
-                margin-bottom: 10px;
-                input {
-                    vertical-align: middle;
-                }
-
-            }
-        }
-    }
     .archetypeAdvancedOptions {
         margin-top: 15px;
         div {
@@ -410,6 +394,26 @@
         label {
             width: 400px;
         }
+        .archetypeFieldsetGroups {
+            padding: 0 10px;
+            margin-bottom: 20px;
+            ul {
+                padding: 0;
+                margin: 0;
+
+                li {
+                    margin-bottom: 10px;
+                    label {
+                        width: 120px;
+                    }
+
+                    input {
+                        vertical-align: middle;
+                        width: 240px;
+                    }
+                }
+            }
+        }        
     }
 
     .archetypeMaxFieldsets{
diff --git a/app/views/archetype.config.html b/app/views/archetype.config.html
index 6f0c58f..653a95c 100644
--- a/app/views/archetype.config.html
+++ b/app/views/archetype.config.html
@@ -80,22 +80,6 @@
             </div>
         </li>
     </ul>
-    
-    <div class="archetypeFieldsetGroups">
-        <h5><archetype-localize key="fieldsetGroups">Fieldset groups</archetype-localize></h5>
-        <p><archetype-localize key="fieldsetGroupsDescription">If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.</archetype-localize></p>
-        <ul ui-sortable="sortableOptions" ng-model="archetypeConfigRenderModel.fieldsetGroups">
-            <li ng-repeat="fieldsetGroup in archetypeConfigRenderModel.fieldsetGroups">
-                <div>
-                    <label for="archetypeFieldsetGroupName_{{$index}}"><archetype-localize key="fieldsetGroupName">Name</archetype-localize></label>
-                    <input id="archetypeFieldsetGroupName_{{$index}}" type="text" ng-model="fieldsetGroup.name" />
-                    <i class="icon icon-delete" ng-click="removeFieldsetGroup($index)"></i>
-                    <i class="icon icon-navigation handle" ng-show="archetypeConfigRenderModel.fieldsetGroups.length > 1"></i>
-                </div>
-            </li>
-        </ul>
-        <label ng-click="addFieldsetGroup($index)"><i class="icon icon-add"></i> <archetype-localize key="addFieldsetGroup">Add group</archetype-localize></label>
-    </div>
 
     <div class="archetypeOptions">
         <div>
@@ -105,6 +89,22 @@
     </div>
 
     <div class="archetypeAdvancedOptions" ng-show="archetypeConfigRenderModel.showAdvancedOptions">
+        <div class="archetypeFieldsetGroups">
+            <h4><archetype-localize key="fieldsetGroups">Fieldset groups</archetype-localize></h4>
+            <p><archetype-localize key="fieldsetGroupsDescription">If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.</archetype-localize></p>
+            <ul ui-sortable="sortableOptions" ng-model="archetypeConfigRenderModel.fieldsetGroups">
+                <li ng-repeat="fieldsetGroup in archetypeConfigRenderModel.fieldsetGroups">
+                    <div>
+                        <label for="archetypeFieldsetGroupName_{{$index}}"><archetype-localize key="fieldsetGroupName">Name</archetype-localize></label>
+                        <input id="archetypeFieldsetGroupName_{{$index}}" type="text" ng-model="fieldsetGroup.name" />
+                        <i class="icon icon-delete" ng-click="removeFieldsetGroup($index)"></i>
+                        <i class="icon icon-navigation handle" ng-show="archetypeConfigRenderModel.fieldsetGroups.length > 1"></i>
+                    </div>
+                </li>
+            </ul>
+            <label ng-click="addFieldsetGroup($index)"><i class="icon icon-add"></i> <archetype-localize key="addFieldsetGroup">Add group</archetype-localize></label>
+            <hr/>
+        </div>
         <div>
             <label for="archetypeAdvancedOptionsStartWithAddButton"><archetype-localize key="startWithAddButton">Start With Add Button?</archetype-localize><small><archetype-localize key="startWithAddButtonDescription">Empty property shows an add button instead of providing a default fieldset.</archetype-localize></small></label>
             <input type="checkbox" id="archetypeAdvancedOptionsStartWithAddButton" ng-model="archetypeConfigRenderModel.startWithAddButton"/>