diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js
index 462fc1d..a6dde9f 100644
--- a/app/controllers/config.controller.js
+++ b/app/controllers/config.controller.js
@@ -5,7 +5,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
 
     //define empty items
     var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeId": "-88", "value": ""}';
-    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "tooltip": "", "icon": "", "label": "", "headerText": "", "footerText": "", "properties": [' + newPropertyModel + ']}';
+    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + ']}';
     var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "fieldsets": [' + newFieldsetModel + ']}');
 
     //ini the model
diff --git a/app/views/archetype.config.html b/app/views/archetype.config.html
index f0550c6..ef6ef9a 100644
--- a/app/views/archetype.config.html
+++ b/app/views/archetype.config.html
@@ -18,18 +18,9 @@
                     <div class="archetypeFieldsetOption">
                         <label>Label Template</label><input type="text" ng-model="fieldset.labelTemplate" />
                     </div>
-                    <div class="archetypeFieldsetOption">
-                        <label>Tooltip</label><input type="text" ng-model="fieldset.tooltip" />
-                    </div>
                     <div class="archetypeFieldsetOption">
                         <label>Icon</label><input type="text" ng-model="fieldset.icon" />
                     </div>
-                    <div class="archetypeFieldsetOption">
-                        <label>Header Text</label><input type="text" ng-model="fieldset.headerText" />
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label>Footer Text</label><input type="text" ng-model="fieldset.footerText" />
-                    </div>
                     <div class="archetypeFieldsetOption">
                         <label>Properties</label>
                     </div>
diff --git a/app/views/archetype.html b/app/views/archetype.html
index 4b3617d..b891bbb 100644
--- a/app/views/archetype.html
+++ b/app/views/archetype.html
@@ -3,7 +3,7 @@
     <div class="archetypeFieldsetToolbar" ng-show="model.config.fieldsets.length > 1 && model.config.hideFieldsetToolbar != '1'">
         <ul> 
             <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias)">
-                <img ng-src='{{fieldsetModel.icon}}' title="{{fieldsetModel.tooltip}}" />
+                <img ng-src='{{fieldsetModel.icon}}' ng-show='fieldsetModel.icon' title="{{fieldsetModel.label}}" />
                 <span>{{fieldsetModel.label}}</span>
             </li>
         </ul>
@@ -17,7 +17,7 @@
                     <span class="caret caret-right" ng-show="fieldset.collapse"></span>
 
                     <label ng-click="focusFieldset(fieldset)">
-                        <img ng-src='{{fieldsetConfigModel.icon}}' title="{{fieldsetConfigModel.tooltip}}" />
+                        <img ng-src='{{fieldsetConfigModel.icon}}' title="{{fieldsetConfigModel.label}}" ng-show="fieldsetConfigModel.icon" />
                         <span ng-bind="getFieldsetTitle(fieldsetConfigModel, $index)"></span>
                     </label>
 
@@ -28,11 +28,6 @@
                     </div>
                 </div>
                 <div class="arechetypeCollapser animate-hide" ng-hide="fieldset.collapse">
-
-                    <div class="archetypeFieldsetHeaderText" ng-show="fieldsetConfigModel.headerText">
-                        <em>{{fieldsetConfigModel.headerText}}</em>
-                    </div>
-
                     <form class="form-inline">
                         <div ng-class="{archetypePropertyError: getPropertyValidity($parent.$index, property.alias) === false}" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
                             <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{property.alias}}">
@@ -47,12 +42,6 @@
                             </div>
                         </div>
                     </form>
-
-
-                    <div class="archetypeFieldsetFooterText" ng-show="fieldsetConfigModel.footerText">
-                        <em>{{fieldsetConfigModel.footerText}}</em>
-                    </div>
-
                 </div>
             </fieldset>
         </li>