diff --git a/app/less/archetype.less b/app/less/archetype.less
index 6dd0ac0..3a8e9ee 100644
--- a/app/less/archetype.less
+++ b/app/less/archetype.less
@@ -22,7 +22,7 @@
 
 .archetypeEditor .archetypeFieldsetLabel {
     position: relative;
-    width: 100%%;
+    width: 100%;
 
     .label-sub {
         padding: 8px 0;
@@ -33,11 +33,12 @@
     }
 
     .dropdown-menu {
+        position: relative;
         padding: 0;
         border-radius: 0;
         box-shadow: none;
         margin-top: -10px;
-        margin-left: -200px;
+        /*margin-left: -200px;*/
     }
 
     span {
@@ -95,6 +96,7 @@
     background-color: #fff;
     border-top: 1px solid silver;
     border-radius: 0 0 0 5px;
+    overflow: hidden;
 }
 
 .archetypeEditor .multiPropertyTextbox{
diff --git a/app/views/archetype.default.html b/app/views/archetype.default.html
index 4a5f83d..f37906f 100644
--- a/app/views/archetype.default.html
+++ b/app/views/archetype.default.html
@@ -30,14 +30,14 @@
                 <div class="archetypeCollapser animate-hide" ng-hide="isCollapsed(fieldset)">
                     <form class="form-inline">
                         <div ng-class="[property.alias, (getPropertyValidity($parent.$index, property.alias) === false ? 'archetypePropertyError' : '')]" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
-                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{umbracoHostPropertyAlias}}-f{{$parent.$index}}-{{property.alias}}-p{{$index}}">
+                            <label ng-hide="model.config.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{model.alias}}-{{$parent.$index}}-{{$index}}">
                                 <span>{{property.label}}</span>
                                 <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
                                     <small>{{property.helpText}}</small>
                                 </div>
                             </label>
 
-                            <div class="controls">
+                            <div ng-class="[(model.config.hidePropertyLabels == '1' ? 'controls-no-label' : 'controls')]">
                                 <archetype-property class="archetypeEditor" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-form = "form"></archetype-property>
                             </div>
                         </div>