diff --git a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared.js b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared.js
index af924aafc..f2c8daf80 100644
--- a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared.js
+++ b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared.js
@@ -10267,7 +10267,7 @@ function (
             vm.userAreas = _.filter(userAreas, function(userArea) { return userArea.userAreaCode !== 'COF' });
 
             if (vm.userAreas.length == 1) {
-                vm.command.userAreaCode = vm.userArea.userAreaCode;
+                vm.command.userAreaCode = vm.userAreas[0].userAreaCode;
             }
         }
     }
@@ -10351,8 +10351,8 @@ function (
 
             return command;
         });
-
-        if (!vm.command.redirectoToSignIn) {
+        
+        if (!vm.command.redirectToSignIn) {
             vm.command.userAreaCodeForSignInRedirect = null;
         }
 
@@ -10487,7 +10487,7 @@ function (
         
         if (accessRuleSet.userAreaForSignInRedirect) {
             command.userAreaCodeForSignInRedirect = accessRuleSet.userAreaForSignInRedirect.userAreaCode;
-            command.redirectoToSignIn = true;
+            command.redirectToSignIn = true;
         }
 
         return command;
@@ -10503,17 +10503,18 @@ function (
 
         if (!vm.userAreasInRules.length) {
             // all user areas have been removed from the list
-            vm.command.redirectoToSignIn = false;
+            vm.command.redirectToSignIn = false;
             vm.command.userAreaCodeForSignInRedirect = null;
         } else if (!_.find(vm.userAreasInRules, function(userArea) { return userArea.userAreaCode === vm.command.userAreaCodeForSignInRedirect; })) {
             // the selected user area has been removed from the list
-            vm.command.redirectoToSignIn = false;
+            vm.command.redirectToSignIn = false;
             vm.command.userAreaCodeForSignInRedirect = null;
         }
         
         if (!vm.command.userAreaCodeForSignInRedirect && vm.userAreasInRules.length) {
             // set a default selection in-case the list is hidden
             vm.command.userAreaCodeForSignInRedirect = vm.userAreasInRules[0].userAreaCode;
+        console.log('setting vm.command.userAreaCodeForSignInRedirect', vm.command.userAreaCodeForSignInRedirect);
         } 
     }
 
diff --git a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_min.js b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_min.js
index bc363961a..51a434161 100644
--- a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_min.js
+++ b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_min.js
@@ -496,8 +496,8 @@ angular.module("cms.shared").directive("cmsFormFieldDocumentTypeSelector",["_","
 angular.module("cms.shared").directive("cmsFormFieldDocumentUpload",["_","shared.internalModulePath","baseFormFieldFactory",function(e,t,o){e={templateUrl:t+"UIComponents/DocumentAssets/FormFieldDocumentUpload.html",scope:e.extend(o.defaultConfig.scope,{asset:"=cmsAsset",loadState:"=cmsLoadState"}),passThroughAttributes:["required","ngRequired"],getInputEl:function(e){return e.find("cms-document-upload")}};return o.create(e)}]);
 angular.module("cms.shared").controller("UploadDocumentAssetDialogController",["$scope","shared.LoadState","shared.documentService","shared.SearchQuery","shared.focusService","shared.stringUtilities","options","close",function(e,t,o,n,a,i,s,l){var r=e;function c(){r.saveLoadState.on(),o.add(r.command).progress(r.saveLoadState.setProgress).then(m)}function d(){var e=r.command;e.file&&e.file.name&&(e.title=i.capitaliseFirstLetter(i.getFileNameWithoutExtension(e.file.name)),e.fileName=i.slugify(e.title),a.focusById("title"))}function f(){l()}function u(){return s.filter.fileExtension||s.filter.fileExtensions}function m(e){s.onUploadComplete(e),l()}angular.extend(e,s),r.command={},r.onUpload=c,r.onCancel=f,r.close=f,r.filter=s.filter,r.onFileChanged=d,r.hasFilterRestrictions=u,r.saveLoadState=new t}]);
 angular.module("cms.shared").controller("ImageAssetEditorDialogController",["$scope","shared.LoadState","shared.imageService","shared.SearchQuery","shared.urlLibrary","options","close",function(e,t,a,m,i,n,d){var s=e;function o(){d()}function r(){s.command.altTag=s.command.imageAsset.title||s.command.imageAsset.fileName}function g(){var e={width:h(s.command.width),height:h(s.command.height)};e.width||e.height||(e.width="100%",e.height="auto");var t=i.getImageUrl(s.command.imageAsset,-1<((a=e).width||"").indexOf("%")||-1<(a.height||"").indexOf("%")?{}:{width:a.width.replace("px",""),height:a.height.replace("px","")}),a=s.command.altTag||"",t={markdown:"![Alt "+a+"]("+t+")",html:"<img src='"+t+"' alt='"+a+"' data-image-asset-id='"+s.command.imageAssetId+"' />",model:s.command};t.html=(a=t.html,e=e,angular.element(a).css(e)[0].outerHTML),s.onSelected(t),d()}function h(e){return e?-1==e.indexOf("px")&&-1==e.indexOf("%")&&-1==e.indexOf("auto")?e+"px":e:""}angular.extend(e,n),s.formLoadState=new t,s.saveLoadState=new t,s.onInsert=g,s.onCancel=o,s.onImageChanged=r,s.command={},function(){var e,t;s.imageAssetHtml&&s.imageAssetHtml.length&&(s.command.imageAssetId=s.imageAssetHtml.attr("data-image-asset-id"),s.command.altTag=s.imageAssetHtml.attr("alt"),s.command.style=s.imageAssetHtml.attr("style"),s.command.style?(t=function(e){var t,a=/([\w-]*)\s*:\s*([^;]*)/g,m={};for(;t=a.exec(e);)m[t[1]]=t[2];return m}(s.command.style),s.command.width=t.width,s.command.height=t.height):(s.command.width=s.imageAssetHtml.attr("width"),s.command.height=s.imageAssetHtml.attr("height")),s.command.imageAssetId||(e=s.imageAssetHtml.attr("src"),t=e.lastIndexOf("/"),t=e.substr(t+1,e.indexOf("_")-t-1),s.command.imageAssetId=t))}()}]);
-angular.module("cms.shared").controller("AddEntityAccessRuleController",["$scope","$q","shared.LoadState","shared.roleService","shared.userAreaService","options","close",function(e,o,n,r,a,t,d){var s=e;function u(){s.command.roleId=null}function l(e){if(s.command.userAreaCode)return e.userAreaCode=s.command.userAreaCode,e.excludeAnonymous=!0,r.search(e);e=o.defer();return e.resolve(),e.promise}function c(){t.onSave(s.command),d()}function f(){d()}s.globalLoadState=new n,s.saveLoadState=new n,s.formLoadState=new n,function(e){s.globalLoadState.on(),e&&_.isFunction(e.on)&&e.on()}(s.formLoadState),s.onAdd=c,s.onCancel=f,s.onUserAreaChanged=u,s.searchRoles=l,s.command={},u(),a.getAll().then(function(e){s.userAreas=_.filter(e,function(e){return"COF"!==e.userAreaCode}),1==s.userAreas.length&&(s.command.userAreaCode=s.userArea.userAreaCode)}).finally(function(e){s.globalLoadState.off(),e&&_.isFunction(e.off)&&e.off()}.bind(null,s.formLoadState))}]);
-angular.module("cms.shared").controller("EntityAccessEditorController",["$scope","$q","shared.LoadState","shared.userAreaService","shared.roleService","shared.modalDialogService","shared.arrayUtilities","shared.internalModulePath","shared.permissionValidationService","shared.urlLibrary","options","close",function(e,t,n,o,i,r,s,a,c,u,d,l){var A=e;function f(){A.command.accessRules=_.map(A.accessRuleSet.accessRules,function(e){var n=d.entityIdPrefix+"AccessRuleId",r={userAreaCode:e.userArea.userAreaCode,roleId:e.role?e.role.roleId:null};return r[n]=e[n],r}),A.command.redirectoToSignIn||(A.command.userAreaCodeForSignInRedirect=null),g(A.saveLoadState),d.saveAccess(A.command).then(function(e,n){return S(n).then(A.mainForm.formStatus.success.bind(null,e))}.bind(null,"Access rules updated successfully")).then(l).finally(y.bind(null,A.saveLoadState))}function R(){r.show({templateUrl:a+"UIComponents/EntityAccess/AddEntityAccessRule.html",controller:"AddEntityAccessRuleController",options:{onSave:h}})}function m(e,n){s.removeObject(A.accessRuleSet.accessRules,e),I()}function h(r){var n={};_.find(A.accessRuleSet.accessRules,function(e){var n=e.role?e.role.roleId:null;return e.userArea.userAreaCode===r.userAreaCode&&n==r.roleId})||(g(),t.all([r.roleId?i.getById(r.roleId).then(function(e){n.role=e}):t(function(e){e()}),o.getByCode(r.userAreaCode).then(function(e){n.userArea=e})]).then(function(){A.accessRuleSet.accessRules.push(n),A.accessRuleSet.accessRules=_(A.accessRuleSet.accessRules).chain().sortBy(function(e){return e.role?e.role.roleId:-1}).sortBy(function(e){return e.userArea.userAreaCode}).value(),I()}).finally(y))}function S(e){return A.entityDefinitionName=d.entityDefinitionName,A.entityDefinitionNameLower=d.entityDefinitionName.toLowerCase(),A.entityDescription=d.entityDescription,A.violationActions=[{id:"Error",name:"Error",description:"Error (403: Forbidden)"},{id:"NotFound",name:"Not Found",description:"Not Found (404: Not Found)"}],d.entityAccessLoader().then(function(e){A.accessRuleSet=e,A.command=function(e){var n=_.pick(e,d.entityIdPrefix+"Id","userAreaCodeForSignInRedirect","violationAction");e.userAreaForSignInRedirect&&(n.userAreaCodeForSignInRedirect=e.userAreaForSignInRedirect.userAreaCode,n.redirectoToSignIn=!0);return n}(e),A.inheritedRules=[],_.each(A.accessRuleSet.inheritedAccessRules,function(n){n.violationAction=_.findWhere(A.violationActions,{id:n.violationAction}),n.userAreaForSignInRedirect?(n.signInRedirect="Yes",n.signInRedirectDescription="If the user is not signed in, then they will be redirected to the sign in page associated with the "+n.userAreaForSignInRedirect.name+" user area."):(n.signInRedirect="No",n.signInRedirectDescription="No sign in redirection, the default action will trigger instead."),_.each(n.accessRules,function(e){e.accessRuleSet=n,A.inheritedRules.push(e)})}),I()}).then(y.bind(null,e))}function I(){A.userAreasInRules=_(A.accessRuleSet.accessRules).chain().map(function(e){return e.userArea}).uniq(function(e){return e.userAreaCode}).sortBy("userAreaCode").value(),A.userAreasInRules.length&&_.find(A.userAreasInRules,function(e){return e.userAreaCode===A.command.userAreaCodeForSignInRedirect})||(A.command.redirectoToSignIn=!1,A.command.userAreaCodeForSignInRedirect=null),!A.command.userAreaCodeForSignInRedirect&&A.userAreasInRules.length&&(A.command.userAreaCodeForSignInRedirect=A.userAreasInRules[0].userAreaCode)}function g(e){A.globalLoadState.on(),e&&_.isFunction(e.on)&&e.on()}function y(e){A.globalLoadState.off(),e&&_.isFunction(e.off)&&e.off()}A.save=f,A.close=l,A.add=R,A.deleteRule=m,A.globalLoadState=new n,A.saveLoadState=new n,A.formLoadState=new n(!0),A.urlLibrary=u,A.canManage=c.hasPermission(d.entityDefinitionCode+"ACCRUL"),A.editMode=A.canManage,S(A.formLoadState)}]);
+angular.module("cms.shared").controller("AddEntityAccessRuleController",["$scope","$q","shared.LoadState","shared.roleService","shared.userAreaService","options","close",function(e,o,n,r,a,t,d){var s=e;function u(){s.command.roleId=null}function l(e){if(s.command.userAreaCode)return e.userAreaCode=s.command.userAreaCode,e.excludeAnonymous=!0,r.search(e);e=o.defer();return e.resolve(),e.promise}function c(){t.onSave(s.command),d()}function f(){d()}s.globalLoadState=new n,s.saveLoadState=new n,s.formLoadState=new n,function(e){s.globalLoadState.on(),e&&_.isFunction(e.on)&&e.on()}(s.formLoadState),s.onAdd=c,s.onCancel=f,s.onUserAreaChanged=u,s.searchRoles=l,s.command={},u(),a.getAll().then(function(e){s.userAreas=_.filter(e,function(e){return"COF"!==e.userAreaCode}),1==s.userAreas.length&&(s.command.userAreaCode=s.userAreas[0].userAreaCode)}).finally(function(e){s.globalLoadState.off(),e&&_.isFunction(e.off)&&e.off()}.bind(null,s.formLoadState))}]);
+angular.module("cms.shared").controller("EntityAccessEditorController",["$scope","$q","shared.LoadState","shared.userAreaService","shared.roleService","shared.modalDialogService","shared.arrayUtilities","shared.internalModulePath","shared.permissionValidationService","shared.urlLibrary","options","close",function(e,o,n,t,i,r,s,a,c,u,d,l){var A=e;function f(){A.command.accessRules=_.map(A.accessRuleSet.accessRules,function(e){var n=d.entityIdPrefix+"AccessRuleId",r={userAreaCode:e.userArea.userAreaCode,roleId:e.role?e.role.roleId:null};return r[n]=e[n],r}),A.command.redirectToSignIn||(A.command.userAreaCodeForSignInRedirect=null),I(A.saveLoadState),d.saveAccess(A.command).then(function(e,n){return h(n).then(A.mainForm.formStatus.success.bind(null,e))}.bind(null,"Access rules updated successfully")).then(l).finally(C.bind(null,A.saveLoadState))}function R(){r.show({templateUrl:a+"UIComponents/EntityAccess/AddEntityAccessRule.html",controller:"AddEntityAccessRuleController",options:{onSave:S}})}function m(e,n){s.removeObject(A.accessRuleSet.accessRules,e),g()}function S(r){var n={};_.find(A.accessRuleSet.accessRules,function(e){var n=e.role?e.role.roleId:null;return e.userArea.userAreaCode===r.userAreaCode&&n==r.roleId})||(I(),o.all([r.roleId?i.getById(r.roleId).then(function(e){n.role=e}):o(function(e){e()}),t.getByCode(r.userAreaCode).then(function(e){n.userArea=e})]).then(function(){A.accessRuleSet.accessRules.push(n),A.accessRuleSet.accessRules=_(A.accessRuleSet.accessRules).chain().sortBy(function(e){return e.role?e.role.roleId:-1}).sortBy(function(e){return e.userArea.userAreaCode}).value(),g()}).finally(C))}function h(e){return A.entityDefinitionName=d.entityDefinitionName,A.entityDefinitionNameLower=d.entityDefinitionName.toLowerCase(),A.entityDescription=d.entityDescription,A.violationActions=[{id:"Error",name:"Error",description:"Error (403: Forbidden)"},{id:"NotFound",name:"Not Found",description:"Not Found (404: Not Found)"}],d.entityAccessLoader().then(function(e){A.accessRuleSet=e,A.command=function(e){var n=_.pick(e,d.entityIdPrefix+"Id","userAreaCodeForSignInRedirect","violationAction");e.userAreaForSignInRedirect&&(n.userAreaCodeForSignInRedirect=e.userAreaForSignInRedirect.userAreaCode,n.redirectToSignIn=!0);return n}(e),A.inheritedRules=[],_.each(A.accessRuleSet.inheritedAccessRules,function(n){n.violationAction=_.findWhere(A.violationActions,{id:n.violationAction}),n.userAreaForSignInRedirect?(n.signInRedirect="Yes",n.signInRedirectDescription="If the user is not signed in, then they will be redirected to the sign in page associated with the "+n.userAreaForSignInRedirect.name+" user area."):(n.signInRedirect="No",n.signInRedirectDescription="No sign in redirection, the default action will trigger instead."),_.each(n.accessRules,function(e){e.accessRuleSet=n,A.inheritedRules.push(e)})}),g()}).then(C.bind(null,e))}function g(){A.userAreasInRules=_(A.accessRuleSet.accessRules).chain().map(function(e){return e.userArea}).uniq(function(e){return e.userAreaCode}).sortBy("userAreaCode").value(),A.userAreasInRules.length&&_.find(A.userAreasInRules,function(e){return e.userAreaCode===A.command.userAreaCodeForSignInRedirect})||(A.command.redirectToSignIn=!1,A.command.userAreaCodeForSignInRedirect=null),!A.command.userAreaCodeForSignInRedirect&&A.userAreasInRules.length&&(A.command.userAreaCodeForSignInRedirect=A.userAreasInRules[0].userAreaCode,console.log("setting vm.command.userAreaCodeForSignInRedirect",A.command.userAreaCodeForSignInRedirect))}function I(e){A.globalLoadState.on(),e&&_.isFunction(e.on)&&e.on()}function C(e){A.globalLoadState.off(),e&&_.isFunction(e.off)&&e.off()}A.save=f,A.close=l,A.add=R,A.deleteRule=m,A.globalLoadState=new n,A.saveLoadState=new n,A.formLoadState=new n(!0),A.urlLibrary=u,A.canManage=c.hasPermission(d.entityDefinitionCode+"ACCRUL"),A.editMode=A.canManage,h(A.formLoadState)}]);
 angular.module("cms.shared").factory("shared.entityVersionModalDialogService",["shared.entityVersionService","shared.modalDialogService",function(s,a){var t={},l={entityNameSingular:"Page"};return t.publish=function(t,e,i){var n=i||l,i={title:"Publish "+n.entityNameSingular,message:"Are you sure you want to publish this "+n.entityNameSingular.toLowerCase()+"?",okButtonTitle:"Yes, publish it",onOk:function(){return e(),s.publish(n.isCustomEntity,t)}};return a.confirm(i)},t.unpublish=function(t,e,i){var n=i||l,i={title:"Unpublish "+n.entityNameSingular,message:"Unpublishing this "+n.entityNameSingular.toLowerCase()+" will remove it from the live site and put it into draft status. Are you sure you want to continue?",okButtonTitle:"Yes, unpublish it",onOk:function(){return e(),s.unpublish(n.isCustomEntity,t)}};return a.confirm(i)},t.copyToDraft=function(t,e,i,n,r){var o=r||l,r={title:"Copy "+o.entityNameSingular+" Version",message:"A draft version of this "+o.entityNameSingular.toLowerCase()+" already exists. Copying this version will delete the current draft. Do you wish to continue?",okButtonTitle:"Yes, replace it",onOk:function(){return n(),s.removeDraft(o.isCustomEntity,t).then(u)}};return i?a.confirm(r):(n(),u());function u(){return s.duplicateDraft(o.isCustomEntity,t,e)}},t}]);
 angular.module("cms.shared").directive("cmsForm",["shared.internalModulePath",function(e){return{restrict:"E",templateUrl:e+"UIComponents/Form/Form.html",replace:!0,transclude:!0,scope:{editMode:"=cmsEditMode",name:"@cmsName"},compile:function(e,n){angular.isDefined(n.cmsEditMode)||(n.cmsEditMode="true");return r},controller:["$scope",function(e){e.getForm=function(){return e[e.name]},this.getFormScope=function(){return e}}]};function r(e,n,r,t){(function e(n,r){var t=n.$parent;if(!t)return r||n;angular.isDefined(t.vm)&&(r=t.vm);return e(t,r)})(e)[e.name]=e.getForm()}}]);
 angular.module("cms.shared").directive("cmsFormSection",["shared.internalModulePath","$timeout",function(e,n){return{restrict:"E",templateUrl:e+"UIComponents/Form/FormSection.html",scope:{title:"@cmsTitle"},replace:!0,transclude:!0,link:function(e,l,t){n(function(){var e=angular.element(l[0].querySelector(".help-inline")),t=angular.element(l[0].querySelector(".toggle-helpers"));e.length&&t.addClass("show").on("click",function(){t.toggleClass("active"),l.toggleClass("show-helpers")})},100)}}}]);
diff --git a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_templates.js b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_templates.js
index 400c0c94e..dcfc9ac77 100644
--- a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_templates.js
+++ b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Content/js/shared_templates.js
@@ -19,7 +19,7 @@ t.put('/Admin/Modules/Shared/Js/UIComponents/DocumentAssets/FormFieldDocumentUpl
 t.put('/Admin/Modules/Shared/Js/UIComponents/DocumentAssets/UploadDocumentAssetDialog.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        Upload a document    </cms-modal-dialog-header>    <cms-form cms-name="mainForm" ng-submit="onUpload()">        <cms-page-actions>            <cms-button cms-text="Upload" ng-click="onUpload()" class="main-cta" ng-disabled="mainForm.$invalid || saveLoadState.isLoading"></cms-button>            <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        </cms-page-actions>        <cms-page-body>            <cms-warning-message ng-if="hasFilterRestrictions()">The document field you are assigning to has restrictions. If you are unsure, cancel this dialog and check the filters menu.</cms-warning-message>            <cms-form-section cms-title="Document details">                <cms-form-field-document-upload cms-title="File"                                                cms-model="command.file"                                                cms-change="onFileChanged()"                                                cms-load-state="saveLoadState"                                                ng-required="true"></cms-form-field-document-upload>                <cms-form-field-text cms-title="Title"                                     cms-model="command.title"                                     cms-description="A short descriptive title e.g. \'Today\'s Menu\' or \'Directions to our office\'."                                     max-length="130"                                     required></cms-form-field-text>                <cms-form-field-text-area cms-title="Description"                                          cms-model="command.description"></cms-form-field-text-area>                <cms-form-field-tags cms-title="CMS Tags"                                     cms-model="command.tags"></cms-form-field-tags>            </cms-form-section>        </cms-page-body>    </cms-form></cms-modal-dialog-container>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/EditorDialogs/ImageAssetEditorDialog.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        Insert an image    </cms-modal-dialog-header>    <cms-form cms-name="editorDialogForm"              ng-submit="vm.onInsert()">        <cms-page-actions>            <cms-button cms-text="Insert" ng-click="onInsert()" class="main-cta"></cms-button>            <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        </cms-page-actions>        <cms-page-body cms-content-type="form">            <cms-form-status></cms-form-status>            <!--MAIN-->            <cms-form-section cms-title="Properties">                <cms-form-field-image-asset cms-title="Image"                                            cms-load-state="saveLoadState"                                            cms-asset="command.imageAsset"                                            cms-model="command.imageAssetId"                                            cms-update-asset="true"                                            required                                            cms-description=""                                            cms-change="onImageChanged()"></cms-form-field-image-asset>                <cms-form-field-text cms-title="Alt tag"                                     cms-model="command.altTag"                                     cms-description="A sentence that best describes the image."                                     maxlength="255"></cms-form-field-text>                <cms-form-field-text cms-title="Width"                                     cms-model="command.width"                                     cms-description="Specify a width in px or %. If you would like this image to scale with the page size, enter a width of 100% and height of auto."                                     maxlength="10"></cms-form-field-text>                <cms-form-field-text cms-title="Height"                                     cms-model="command.height"                                     cms-description="Enter auto in here if you would like the height to respect the ratio"                                     maxlength="10"></cms-form-field-text>            </cms-form-section>        </cms-page-body>    </cms-form></cms-modal-dialog-container>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/EntityAccess/AddEntityAccessRule.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        Add Access Rule    </cms-modal-dialog-header>    <cms-form cms-name="mainForm" ng-submit="onAdd()">        <cms-page-actions>            <cms-button cms-text="Add" ng-click="onAdd()" class="main-cta" ng-disabled="mainForm.$invalid || saveLoadState.isLoading"></cms-button>            <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        </cms-page-actions>        <cms-page-body cms-content-type="form">            <cms-form-status></cms-form-status>            <cms-form-section cms-title="Permit Access To">                <cms-form-field-dropdown cms-title="User Area"                    cms-options="userAreas"                    cms-option-name="name"                    cms-option-value="userAreaCode"                    cms-model="command.userAreaCode"                    cms-description="The user area to restrict access to."                    cms-change="onUserAreaChanged()"                    required></cms-form-field-dropdown>                <cms-form-field-filtered-dropdown cms-title="Role"                        cms-search-function="searchRoles($query)"                        cms-option-name="title"                        cms-option-value="roleId"                        cms-model="command.roleId"                        cms-description="Optionally you can restrict access to a specific role within the user area."                        ></cms-form-field-dropdown>            </cms-form-section>        </cms-page-body>    </cms-form></cms-modal-dialog-container>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditor.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        {{::entityDefinitionName}} Access: {{::entityDescription}}    </cms-modal-dialog-header>    <cms-form cms-name="mainForm"        cms-edit-mode="editMode"        ng-submit="save()"        cms-loading="formLoadState.isLoading">        <cms-page-actions ng-show="!editMode">            <cms-button cms-text="Ok"                ng-click="close()"                ng-disabled="globalLoadState.isLoading" class="main-cta"></cms-button>        </cms-page-actions>        <!-- Edit mode toolbar -->        <cms-page-actions ng-show="editMode">            <cms-button-submit cms-text="Save"                cms-loading="saveLoadState.isLoading"                ng-disabled="mainForm.$invalid || globalLoadState.isLoading"></cms-button-submit>            <cms-button cms-text="Cancel"                ng-click="close()"                ng-disabled="globalLoadState.isLoading"></cms-button>        </cms-page-actions>        <cms-page-body>            <cms-form-status></cms-form-status>            <cms-form-section cms-title="Inherited Rules"                 ng-if="inheritedRules.length"                cms-loading="formLoadState.isLoading">                <cms-form-field-container>                     <p>                        These rules are inherited from parent directories. Users will need to meet the rule requirements for each                        parent directory in order to gain access.                    </p>                </cms-form-field-container>                <cms-form-field-container>                    <cms-table-container>                        <table>                            <thead>                                <tr>                                    <th>Directory</th>                                    <th>User Area</th>                                    <th>Role</th>                                    <th>Redirect to Sign-in</th>                                    <th>Default Action</th>                                </tr>                            </thead>                            <tbody>                                <tr ng-repeat="rule in inheritedRules">                                    <td><a href="{{urlLibrary.directoryDetails(rule.accessRuleSet.pageDirectory.pageDirectoryId)}}" target="_blank">{{rule.accessRuleSet.pageDirectory.fullUrlPath}}</a></td>                                    <td>{{rule.userArea.name}}</td>                                    <td>{{rule.role.title}}</td>                                    <td title="{{rule.accessRuleSet.signInRedirectDescription}}">{{rule.accessRuleSet.signInRedirect}}</td>                                    <td title="{{rule.accessRuleSet.violationAction.description}}">{{rule.accessRuleSet.violationAction.name}}</td>                                </tr>                            </tbody>                        </table>                    </cms-table-container>                </cms-form-field-container>            </cms-form-section>            <cms-form-section cms-title="Access Rules">                                                     <cms-form-field-container>                     <p>To be granted access to this {{entityDefinitionNameLower}} users will need to meet the requirements of at least one of these rules.</p>                </cms-form-field-container>                <cms-form-field-container cms-loading="formLoadState.isLoading">                    <cms-table-container>                        <table>                            <thead>                                <tr>                                    <th>User Area</th>                                    <th>Role</th>                                    <th cms-table-column-actions                                        ng-if="canManage">Actions</th>                                </tr>                            </thead>                            <tbody>                                <tr ng-if="accessRuleSet.accessRules.length == 0">                                    <td colspan="100" class="empty">No rules found.</td>                                </tr>                                <tr ng-repeat="rule in accessRuleSet.accessRules">                                    <td>{{rule.userArea.name}}</td>                                    <td>{{rule.role.title}}</td>                                    <td cms-table-column-actions                                        ng-if="canManage">                                        <cms-button-icon cms-title="Delete"                                            cms-icon="trash-o"                                            ng-click="deleteRule(rule, $index)"                                            ng-disabled="globalLoadState.isLoading">                                        </cms-button-icon>                                    </td>                                </tr>                            </tbody>                        </table>                        <cms-table-actions>                            <a href="" class="btn-icon" title="Add"                                cms-icon="plus-circle"                                ng-click="add()"                                ng-if="canManage"                                ng-disabled="globalLoadState.isLoading">                                <i class="fa fa-plus-circle"></i>                            </a>                        </cms-table-actions>                    </cms-table-container>                </cms-form-field-container>            </cms-form-section>            <cms-form-section cms-title="Violation Action">                <cms-form-field-container>                     <p>These options describe what should happen if the user is denied access.</p>                </cms-form-field-container>                <cms-form-field-checkbox cms-title="Redirect to sign-in"                    cms-model="command.redirectToSignIn"                    cms-description="Selecting this option will redirect the user to the sign-in page if they are not logged in. If they are logged in but not authorized to view the page then the default action will be triggered."                ></cms-form-field-checkbox>                <cms-form-field-dropdown cms-title="Redirect to sign-in for area"                    cms-options="userAreasInRules"                    cms-option-name="name"                    cms-option-value="userAreaCode"                    cms-model="command.userAreaCodeForSignInRedirect"                    cms-description="If the user is not signed-in in, then they will be redirected to the sign-in page for the selected user area."                    ng-if="command.redirectToSignIn && userAreasInRules.length > 1"                    required></cms-form-field-dropdown>                <cms-form-field-dropdown cms-title="Default Action"                    cms-options="violationActions"                    cms-option-name="description"                    cms-option-value="id"                    cms-model="command.violationAction"                    cms-description="The action to take when the a user is not authorized to view the page. Using an \'Error\' action tells the user that the page was found but could not be accessed, whereas a \'Not Found\' action will make the page appear not to exist for unauthorized users."                    required></cms-form-field-dropdown>            </cms-form-section>        </cms-page-body></cms-modal-dialog-container>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditor.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        {{::entityDefinitionName}} Access: {{::entityDescription}}    </cms-modal-dialog-header>    <cms-form cms-name="mainForm"        cms-edit-mode="editMode"        ng-submit="save()"        cms-loading="formLoadState.isLoading">        <cms-page-actions ng-show="!editMode">            <cms-button cms-text="Ok"                ng-click="close()"                ng-disabled="globalLoadState.isLoading" class="main-cta"></cms-button>        </cms-page-actions>        <!-- Edit mode toolbar -->        <cms-page-actions ng-show="editMode">            <cms-button-submit cms-text="Save"                cms-loading="saveLoadState.isLoading"                ng-disabled="mainForm.$invalid || globalLoadState.isLoading"></cms-button-submit>            <cms-button cms-text="Cancel"                ng-click="close()"                ng-disabled="globalLoadState.isLoading"></cms-button>        </cms-page-actions>        <cms-page-body>            <cms-form-status></cms-form-status>            <cms-form-section cms-title="Inherited Rules"                 ng-if="inheritedRules.length"                cms-loading="formLoadState.isLoading">                <cms-form-field-container>                     <p>                        These rules are inherited from parent directories. Users will need to meet the rule requirements for each                        parent directory in order to gain access.                    </p>                </cms-form-field-container>                <cms-form-field-container>                    <cms-table-container>                        <table>                            <thead>                                <tr>                                    <th>Directory</th>                                    <th>User Area</th>                                    <th>Role</th>                                    <th>Redirect to Sign-in</th>                                    <th>Default Action</th>                                </tr>                            </thead>                            <tbody>                                <tr ng-repeat="rule in inheritedRules">                                    <td><a href="{{urlLibrary.directoryDetails(rule.accessRuleSet.pageDirectory.pageDirectoryId)}}" target="_blank">{{rule.accessRuleSet.pageDirectory.fullUrlPath}}</a></td>                                    <td>{{rule.userArea.name}}</td>                                    <td>{{rule.role.title}}</td>                                    <td title="{{rule.accessRuleSet.signInRedirectDescription}}">{{rule.accessRuleSet.signInRedirect}}</td>                                    <td title="{{rule.accessRuleSet.violationAction.description}}">{{rule.accessRuleSet.violationAction.name}}</td>                                </tr>                            </tbody>                        </table>                    </cms-table-container>                </cms-form-field-container>            </cms-form-section>            <cms-form-section cms-title="Access Rules">                                                     <cms-form-field-container>                     <p>To be granted access to this {{entityDefinitionNameLower}} users will need to meet the requirements of at least one of these rules.</p>                </cms-form-field-container>                <cms-form-field-container cms-loading="formLoadState.isLoading">                    <cms-table-container>                        <table>                            <thead>                                <tr>                                    <th>User Area</th>                                    <th>Role</th>                                    <th cms-table-column-actions                                        ng-if="canManage">Actions</th>                                </tr>                            </thead>                            <tbody>                                <tr ng-if="accessRuleSet.accessRules.length == 0">                                    <td colspan="100" class="empty">No rules found.</td>                                </tr>                                <tr ng-repeat="rule in accessRuleSet.accessRules">                                    <td>{{rule.userArea.name}}</td>                                    <td>{{rule.role.title}}</td>                                    <td cms-table-column-actions                                        ng-if="canManage">                                        <cms-button-icon cms-title="Delete"                                            cms-icon="trash-o"                                            ng-click="deleteRule(rule, $index)"                                            ng-disabled="globalLoadState.isLoading">                                        </cms-button-icon>                                    </td>                                </tr>                            </tbody>                        </table>                        <cms-table-actions>                            <a href="" class="btn-icon" title="Add"                                cms-icon="plus-circle"                                ng-click="add()"                                ng-if="canManage"                                ng-disabled="globalLoadState.isLoading">                                <i class="fa fa-plus-circle"></i>                            </a>                        </cms-table-actions>                    </cms-table-container>                </cms-form-field-container>            </cms-form-section>            <cms-form-section cms-title="Violation Action" ng-show="userAreasInRules.length">                <cms-form-field-container>                     <p>These options describe what should happen if the user is denied access.</p>                </cms-form-field-container>                <cms-form-field-checkbox cms-title="Redirect to sign-in"                    cms-model="command.redirectToSignIn"                    cms-description="Selecting this option will redirect the user to the sign-in page if they are not logged in. If they are logged in but not authorized to view the page then the default action will be triggered."                ></cms-form-field-checkbox>                <cms-form-field-dropdown cms-title="Redirect to sign-in for area"                    cms-options="userAreasInRules"                    cms-option-name="name"                    cms-option-value="userAreaCode"                    cms-model="command.userAreaCodeForSignInRedirect"                    cms-description="If the user is not signed-in in, then they will be redirected to the sign-in page for the selected user area."                    ng-if="command.redirectToSignIn && userAreasInRules.length > 1"                    required></cms-form-field-dropdown>                <cms-form-field-dropdown cms-title="Default Action"                    cms-options="violationActions"                    cms-option-name="description"                    cms-option-value="id"                    cms-model="command.violationAction"                    cms-description="The action to take when the a user is not authorized to view the page. Using an \'Error\' action tells the user that the page was found but could not be accessed, whereas a \'Not Found\' action will make the page appear not to exist for unauthorized users."                    required></cms-form-field-dropdown>            </cms-form-section>        </cms-page-body></cms-modal-dialog-container>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Form/Form.html','<form ng-transclude       novalidate       name="{{name}}"      class="form-horizontal"       ng-class="editMode ? \'form-edit-on\' : \'form-edit-off\'"></form>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Form/FormSection.html','<fieldset>    <legend>        <span ng-if="title">{{ title }}</span>        <button class="toggle-helpers" type="button"><i class="fa fa-question-circle"></i> Help</button>    </legend>    <div ng-transclude></div></fieldset>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Form/FormSectionActions.html','<div class="form-section-actions" ng-transclude></div>');
@@ -49,6 +49,8 @@ t.put('/Admin/Modules/Shared/Js/UIComponents/FormFields/FormFieldTextArea.html',
 t.put('/Admin/Modules/Shared/Js/UIComponents/FormFields/FormFieldTime.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   ng-show="vm.formScope.editMode && !vm.readonly"                   ng-model="vm.editorModel"                   ng-disabled="vm.disabled"                   ng-change="vm.onChange()"                   type="time"                   ng-model-options="{timezone: \'utc\'}"/>            <div ng-hide="vm.formScope.editMode && !vm.readonly" ng-if="!vm.model" class="text-block-display-value">None</div>            <div ng-hide="vm.formScope.editMode && !vm.readonly" ng-if="vm.model" class="text-block-display-value">{{vm.model | time}}</div>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/FormFields/FormFieldUrl.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input ng-show="vm.formScope.editMode && !vm.readonly"                   type="url"                   ng-model="vm.model"                   ng-disabled="vm.disabled"                   ng-change="vm.onChange()"                   cms-http-prefix                   id="{{vm.modelName}}"                   name="{{vm.modelName}}" />            <div class="text-block-display-value" ng-hide="vm.formScope.editMode && !vm.readonly">{{vm.model}}</div>            <div ng-hide="vm.formScope.editMode && !vm.readonly" ng-if="!vm.model" class="text-block-display-value">None</div>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/FormFields/FormFieldValidationSummary.html','<div ng-if="vm.formScope.editMode && (vm.validators.length || vm.customErrors.length) && (vm.form[vm.modelName].$dirty || vm.customErrors.length)" class="form-validation-summary">    <ul>        <li ng-repeat="error in vm.customErrors"><i class="fa fa-exclamation-circle alert"></i> {{error.message}}</li>        <li ng-repeat="validator in vm.validators" ng-show="vm.form[vm.modelName].$error[validator.name]"><i class="fa fa-exclamation-circle alert"></i> {{validator.message}}</li>    </ul></div>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/Layout/Field.html','<div data-title="{{vm.modelName}}" class="control-group-area"     ng-class="{\'editmode\': vm.formScope.editMode, \'invalid\': !vm.form[vm.modelName].$valid}"     ng-transclude></div>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/Layout/PageBody.html','<div class="page-body {{ vm.contentType }} {{ vm.hasActions === undefined || vm.hasActions == true ? \'with-actions\' : \'\'}}">    <div class="form-wrap" ng-transclude></div></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/ImageAssets/FormFieldImageAnchorLocationSelector.html','<cms-form-field-dropdown cms-title="Cropped Anchor Location"                         cms-model-name="{{vm.modelName}}"                         cms-options="vm.options"                         cms-option-name="name"                         cms-option-value="id"                         cms-model="vm.model"                         cms-readonly="vm.readonly"                         cms-description="The location of the image to display if it has to be cropped dynamically"></cms-form-field-dropdown>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/ImageAssets/FormFieldImageAsset.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <div class="image-asset">                <input type="hidden"                       id="{{vm.modelName}}"                       name="{{vm.modelName}}"                       ng-model="vm.model"                       ng-change="vm.onChange()" />                <cms-image-asset ng-if="vm.previewAsset && (!vm.formScope.editMode || vm.readonly)"                                 cms-image="vm.previewAsset"                                 cms-width="{{vm.previewWidth}}"                                 cms-height="{{vm.previewHeight}}"                                 class="img-polaroid"></cms-image-asset>                <cms-image-asset ng-if="vm.previewAsset && vm.formScope.editMode && !vm.readonly"                                 cms-image="vm.previewAsset"                                 cms-width="{{vm.previewWidth}}"                                 cms-height="{{vm.previewHeight}}"                                 ng-click="vm.showPicker()"                                 class="img-polaroid selectable"></cms-image-asset>                <i class="fa fa-picture-o"                   ng-hide="vm.formScope.editMode && !vm.readonly"                   ng-if="!vm.previewAsset"></i>                <cms-button-icon cms-title="{{vm.buttonText}}"                                 cms-icon="picture-o"                                 ng-show="vm.formScope.editMode && !vm.readonly"                                 ng-if="!vm.previewAsset"                                 ng-click="vm.showPicker()"                                 ng-disabled="vm.loadState.isLoading || vm.disabled">            </div>            <cms-form-field-validation-summary></cms-form-field-validation-summary>            <div class="collection-actions">                <div ng-show="vm.formScope.editMode  && !vm.readonly">                    <cms-button-icon cms-href="{{vm.urlLibrary.imageDetails(vm.previewAsset.imageAssetId)}}"                                     cms-external="true"                                     cms-title="Edit image"                                     cms-icon="external-link"                                     ng-disabled="vm.loadState.isLoading || vm.disabled"                                     ng-if="vm.previewAsset">                    </cms-button-icon>                    <cms-button-icon cms-title="{{vm.buttonText}}"                                     cms-icon="cog"                                     ng-click="vm.showPicker()"                                     ng-disabled="vm.loadState.isLoading || vm.disabled">                    </cms-button-icon>                    <cms-button-icon cms-title="Remove"                                     cms-icon="trash-o"                                     ng-if="vm.isRemovable"                                     ng-click="vm.remove()"                                     ng-disabled="vm.loadState.isLoading || vm.disabled">                    </cms-button-icon>                </div>            </div>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/ImageAssets/FormFieldImageAssetCollection.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input type="hidden"                   id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   ng-model="vm.model"                   ng-change="vm.onChange()" />            <cms-table-container cms-loading="vm.gridLoadState.isLoading">                <table>                    <thead>                        <tr>                            <th>Image</th>                            <th>Title</th>                            <th cms-table-column-actions                                ng-if="vm.formScope.editMode && !vm.readonly">Actions</th>                        </tr>                    </thead>                    <tbody>                        <tr ng-if="!vm.gridData.length">                            <td colspan="100" class="empty">None</td>                        </tr>                        <tr ng-repeat="image in vm.gridData track by $index"                            ui-draggable="vm.formScope.editMode"                            data-drag="image"                            data-drag-channel="asset-{{vm.modelName}}"                            ui-on-drop="vm.onDrop($index, $data)"                            data-drop-channel="asset-{{vm.modelName}}">                            <td>                                <cms-table-cell-image cms-image="image"></cms-table-cell-image>                            </td>                            <td>{{image.title}}</td>                            <td cms-table-column-actions ng-if="vm.formScope.editMode && !vm.readonly">                                <cms-button-icon cms-href="{{vm.urlLibrary.imageDetails(image.imageAssetId)}}"                                                 cms-external="true"                                                 cms-title="Edit image"                                                 cms-icon="external-link">                                </cms-button-icon>                                <cms-button-icon cms-title="Remove"                                                 cms-icon="trash-o"                                                 ng-click="vm.remove(image)">                                </cms-button-icon>                            </td>                        </tr>                    </tbody>                </table>                <cms-table-actions>                    <a href="" class="btn-icon" title="Add"                       ng-click="vm.showPicker()"                       ng-if="vm.formScope.editMode && !vm.readonly"                       ng-disabled="vm.gridLoadState.isLoading || vm.disabled">                        <i class="fa fa-plus-circle"></i>                    </a>                </cms-table-actions>            </cms-table-container>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
@@ -56,11 +58,12 @@ t.put('/Admin/Modules/Shared/Js/UIComponents/ImageAssets/FormFieldImageUpload.ht
 t.put('/Admin/Modules/Shared/Js/UIComponents/ImageAssets/ImageAsset.html','<img ng-src="{{src}}"     title="{{image.title}}" />');
 t.put('/Admin/Modules/Shared/Js/UIComponents/ImageAssets/ImageAssetPickerDialog.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        Find an image    </cms-modal-dialog-header>    <cms-page-actions>        <cms-button cms-text="{{okText}}" ng-click="onOk()" class="main-cta" ng-disabled="!multiMode && !selectedAsset"></cms-button>        <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        <!--FILTER-->        <cms-button cms-text="Filter"                    ng-click="toggleFilter()"></cms-button>        <cms-search-filter cms-query="query"                           cms-filter="filter"                           ng-show="isFilterVisible">            <cms-form-field-text cms-title="Tags"                                 cms-disabled="presetFilter.tags"                                 cms-model="filter.tags"></cms-form-field-text>            <cms-form-field-number cms-title="Width"                                   cms-model="filter.width"                                   cms-disabled="presetFilter.width"                                   ng-hide="presetFilter.minWidth"></cms-form-field-number>            <cms-form-field-number cms-title="Height"                                   cms-model="filter.height"                                   cms-disabled="presetFilter.height"                                   ng-hide="presetFilter.minHeight"></cms-form-field-number>            <cms-form-field-number cms-title="Min Width"                                   cms-model="filter.minWidth"                                   cms-disabled="presetFilter.minWidth"                                   ng-hide="presetFilter.width"></cms-form-field-number>            <cms-form-field-number cms-title="Min Height"                                   cms-model="filter.minHeight"                                   cms-disabled="presetFilter.minHeight"                                   ng-hide="presetFilter.height"></cms-form-field-number>        </cms-search-filter>        <cms-pager cms-result="result"                   cms-query="query"></cms-pager>    </cms-page-actions>    <cms-page-body>        <cms-table-container cms-loading="gridLoadState.isLoading">            <table>                <thead>                    <tr>                        <th>Image</th>                        <th>Title</th>                        <th>Size</th>                        <th>Tags</th>                        <th>Modified</th>                        <th cms-table-column-actions>Actions</th>                    </tr>                </thead>                <tbody>                    <tr ng-if="result.items.length == 0">                        <td colspan="100" class="empty">Sorry, no images could be found.</td>                    </tr>                    <tr ng-repeat="image in result.items"                        ng-class="(isSelected(image)) ? \'selected\' : \'selectable\'"                        ng-click="onSelect(image)"                        ng-dblclick="onSelectAndClose(image)">                        <td>                            <cms-table-cell-image cms-image="::image"></cms-table-cell-image>                        </td>                        <td>                            {{ ::image.title }}                        </td>                        <td>                            <strong>{{::image.width}} x {{::image.height}}</strong>                            <div>{{::image.fileSizeInBytes | bytes}}</div>                        </td>                        <td>                            <cms-tag-list cms-tags="::image.tags"></cms-tag-list>                        </td>                        <td class="lowPriority">                            <cms-table-cell-updated-audit-data cms-audit-data="::image.auditData"></cms-table-cell-updated-audit-data>                        </td>                        <td cms-table-column-actions>                            <cms-button-icon cms-title="Select"                                             cms-icon="square-o"                                             ng-if="!isSelected(image)">                            </cms-button-icon>                            <cms-button-icon cms-title="Selected"                                             cms-icon="check-square-o"                                             ng-if="isSelected(image)">                            </cms-button-icon>                        </td>                    </tr>                </tbody>            </table>            <cms-table-actions>                <a href="" class="btn-icon" title="Upload"                   cms-icon="plus-circle"                   ng-click="onUpload()"                   ng-if="canCreate">                    <i class="fa fa-plus-circle"></i>                </a>            </cms-table-actions>        </cms-table-container>    </cms-page-body></cms-modal-dialog-container>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/ImageAssets/UploadImageAssetDialog.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        Upload an image    </cms-modal-dialog-header>    <cms-form cms-name="mainForm" ng-submit="onUpload()">        <cms-page-actions>            <cms-button cms-text="Upload" ng-click="onUpload()" class="main-cta" ng-disabled="mainForm.$invalid || saveLoadState.isLoading"></cms-button>            <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        </cms-page-actions>        <cms-page-body>            <cms-warning-message ng-if="isFilterSet">This image field has restrictions: {{filterText}}</cms-warning-message>            <cms-form-section cms-title="Image details">                <cms-form-field-image-upload cms-title="File"                                             cms-model="command.file"                                             cms-load-state="saveLoadState"                                             cms-filter="filter"                                             required></cms-form-field-image-upload>                <cms-form-field-text cms-title="Title"                                     cms-model="command.title"                                     max-length="130"                                     required></cms-form-field-text>                <cms-form-field-tags cms-title="CMS Tags"                                     cms-model="command.tags"></cms-form-field-tags>                <cms-form-field-image-anchor-location-selector cms-model="command.defaultAnchorLocation"></cms-form-field-image-anchor-location-selector>            </cms-form-section>        </cms-page-body>    </cms-form></cms-modal-dialog-container>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/Layout/Field.html','<div data-title="{{vm.modelName}}" class="control-group-area"     ng-class="{\'editmode\': vm.formScope.editMode, \'invalid\': !vm.form[vm.modelName].$valid}"     ng-transclude></div>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/Layout/PageBody.html','<div class="page-body {{ vm.contentType }} {{ vm.hasActions === undefined || vm.hasActions == true ? \'with-actions\' : \'\'}}">    <div class="form-wrap" ng-transclude></div></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Loader/ProgressBar.html','<div class="progress" ng-if="loadState && loadState.isLoading">    <div class="progress-bar" role="progressbar" aria-valuenow="{{loadState.progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{loadState.progress}}%;">        <span class="sr-only">{{loadState.progress}}% Complete</span>    </div></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Locales/FormFieldLocaleSelector.html','<cms-form-field-dropdown cms-title="Market"                         cms-model-name="{{vm.modelName}}"                         cms-options="vm.locales"                         cms-option-name="name"                         cms-option-value="id"                         cms-model="vm.model"                         cms-required="vm.isRequired"                         cms-readonly="vm.readonly"                         cms-default-item-text="{{vm.defaultItemText}}"                         ng-show="vm.locales.length > 1"></cms-form-field-dropdown>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Menus/Menu.html','<div class="menu">    <i class="fa fa-{{icon || \'cog\'}}"></i>    <div class="menu-options" ng-transclude></div></div>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/NestedDataModels/EditNestedDataModelDialog.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        {{::title}}    </cms-modal-dialog-header>    <cms-form cms-name="mainForm" ng-submit="save()">        <cms-page-actions>            <cms-button cms-text="OK" ng-click="save()" class="main-cta" ng-disabled="mainForm.$invalid"></cms-button>            <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        </cms-page-actions>        <cms-page-body>            <cms-form-section cms-title="Settings">                <cms-form-dynamic-field-set cms-data-source="formDataSource"                                            cms-additional-parameters="additionalParameters">                </cms-form-dynamic-field-set>            </cms-form-section>        </cms-page-body>    </cms-form></cms-modal-dialog-container>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/NestedDataModels/FormFieldNestedDataModelCollection.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input type="hidden"                   id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   ng-model="vm.model"                   ng-change="vm.onChange()" />            <cms-table-container>                <table>                    <thead>                        <tr>                            <th ng-if="vm.previewFields.fields.previewImage"></th>                            <th ng-if="vm.previewFields.showTitle">{{vm.previewFields.titleTerm}}</th>                            <th ng-if="vm.previewFields.fields.previewDescription">{{vm.previewFields.fields.previewDescription.displayName}}</th>                            <th cms-table-column-actions                                ng-if="vm.formScope.editMode && !vm.readonly">Actions</th>                        </tr>                    </thead>                    <tbody>                         <tr ng-if="!vm.model.length">                            <td colspan="100" class="empty">None</td>                        </tr>                        <tr ng-repeat="entity in vm.model track by $index"                            ui-draggable="vm.formScope.editMode && vm.orderable"                            data-drag="entity"                            data-drag-channel="nested-model-{{vm.modelName}}"                            ui-on-drop="vm.onDrop($index, $data)"                            on-drop-success="vm.onDropSuccess($index)"                            data-drop-channel="nested-model-{{vm.modelName}}">                            <td ng-if="vm.previewFields.fields.previewImage">                                <cms-table-cell-image cms-image="vm.gridImages.images[$index]"></cms-table-cell-image>                            </td>                            <td ng-if="vm.previewFields.showTitle">                                <strong>{{vm.getTitle(entity, $index)}}</strong>                            </td>                            <td ng-if="vm.previewFields.fields.previewDescription">{{entity[vm.previewFields.fields.previewDescription.lowerName]}}</td>                            <td cms-table-column-actions ng-if="vm.formScope.editMode && !vm.readonly">                                <cms-button-icon cms-title="Edit"                                                 cms-icon="pencil"                                                 ng-click="vm.edit(entity, $index)">                                </cms-button-icon>                                <cms-button-icon cms-title="Remove"                                                 cms-icon="trash-o"                                                 ng-click="vm.remove(entity, $index)">                                </cms-button-icon>                            </td>                        </tr>                    </tbody>                </table>                <cms-table-actions>                    <a href="" class="btn-icon" title="Add"                       cms-icon="plus-circle"                       ng-click="vm.add()"                       ng-if="vm.formScope.editMode  && !vm.readonly && (!vm.maxItems || !vm.model || vm.model.length < vm.maxItems)"                       ng-disabled="vm.disabled">                        <i class="fa fa-plus-circle"></i>                    </a>                </cms-table-actions>            </cms-table-container>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/NestedDataModels/FormFieldNestedDataModelMultiTypeCollection.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input type="hidden"                   id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   ng-model="vm.model"                   ng-change="vm.onChange()" />            <cms-table-container>                <table>                    <thead>                        <tr>                            <th ng-if="vm.previewFields.showImage">{{vm.imageColumnHeader}}</th>                            <th ng-if="vm.previewFields.showTitle">{{vm.titleColumnHeader}}</th>                            <th ng-if="vm.previewFields.showDescription">{{vm.descriptionColumnHeader}}</th>                            <th>{{vm.typeColumnHeader}}</th>                            <th cms-table-column-actions                                ng-if="vm.formScope.editMode && !vm.readonly">Actions</th>                        </tr>                    </thead>                    <tbody>                         <tr ng-if="!vm.model.length">                            <td colspan="100" class="empty">None</td>                        </tr>                        <tr ng-repeat="item in vm.model track by $index"                            ui-draggable="vm.formScope.editMode && vm.orderable"                            data-drag="item"                            data-drag-channel="nested-model-{{vm.modelName}}"                            ui-on-drop="vm.onDrop($index, $data)"                            on-drop-success="vm.onDropSuccess($index)"                            data-drop-channel="nested-model-{{vm.modelName}}">                            <td ng-if="vm.previewFields.showImage">                                <cms-table-cell-image cms-image="vm.gridImages.images[$index]"></cms-table-cell-image>                            </td>                            <td ng-if="vm.previewFields.showTitle">                                <strong>{{vm.getTitle(item, $index)}}</strong>                            </td>                            <td ng-if="vm.previewFields.showDescription">{{item.model[vm.previewFields[item.typeName].fields.previewDescription.lowerName]}}</td>                            <td ng-if="vm.previewFields.showTitle">                                {{vm.modelMetaDataLookup[item.typeName].displayName}}                            </td>                            <td cms-table-column-actions ng-if="vm.formScope.editMode && !vm.readonly">                                <cms-button-icon cms-title="Edit"                                                 cms-icon="pencil"                                                 ng-click="vm.edit(item, $index)">                                </cms-button-icon>                                <cms-button-icon cms-title="Remove"                                                 cms-icon="trash-o"                                                 ng-click="vm.remove(item, $index)">                                </cms-button-icon>                            </td>                        </tr>                    </tbody>                </table>                <cms-table-actions ng-if="vm.formScope.editMode && !vm.readonly && (!vm.maxItems || !vm.model || vm.model.length < vm.maxItems)">                    <cms-menu cms-icon="plus-circle">                        <cms-button ng-repeat="(typeName, modelMetaData) in vm.modelMetaDataLookup"                                    cms-text="Add {{modelMetaData.displayName}}"                                    ng-click="vm.add(modelMetaData)"                                    ng-disabled="vm.gridLoadState.isLoading || vm.disabled"></cms-button>                    </cms-menu>                </cms-table-actions>            </cms-table-container>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Modals/Alert.html','<cms-modal-dialog-container>    <cms-modal-dialog-header ng-if="::title">        {{::title}}    </cms-modal-dialog-header>    <cms-modal-dialog-body>        {{::message}}    </cms-modal-dialog-body>    <cms-modal-dialog-actions>        <cms-button cms-text="OK"                    ng-click="close()"></cms-button>    <c/ms-modal-dialog-actions></cms-modal-dialog-container>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Modals/ConfirmDialog.html','<cms-modal-dialog-container>    <cms-modal-dialog-header ng-if="::title">        {{::title}}    </cms-modal-dialog-header>    <cms-modal-dialog-actions>        <cms-button cms-text="{{::okButtonTitle}}"                    class="main-cta"                    ng-click="close(true)"                    cms-loading="onOkLoadState.isLoading"                    ng-disabled="onOkLoadState.isLoading"></cms-button>        <cms-button cms-text="{{::cancelButtonTitle}}"                    ng-click="close(false)"></cms-button>    </cms-modal-dialog-actions>    <cms-modal-dialog-body>        <span ng-bind-html="message"></span>    </cms-modal-dialog-body></cms-modal-dialog-container>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Modals/DeveloperException.html','<cms-modal-dialog-container cms-modal-size="large" class="modal--with-actions">    <cms-modal-dialog-header ng-if="::title">        {{::title}}    </cms-modal-dialog-header>    <cms-modal-dialog-body>        <div ng-if="messageHtml"              ng-bind-html="messageHtml"             class="developer-exception-content"></div>    </cms-modal-dialog-body>    <cms-modal-dialog-actions>        <cms-button cms-text="OK"                    ng-click="close()"></cms-button>    </cms-modal-dialog-actions></cms-modal-dialog-container>');
@@ -68,12 +71,11 @@ t.put('/Admin/Modules/Shared/Js/UIComponents/Modals/ModalDialogActions.html','<d
 t.put('/Admin/Modules/Shared/Js/UIComponents/Modals/ModalDialogBody.html','<div class="modal-body" ng-transclude></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Modals/ModalDialogContainer.html','<div class="modal" ng-class="sizeCls">    <div class="modal-dialog">        <div class="modal-content" ng-transclude>        </div>    </div></div><div class="modal-background" ng-class="sizeCls" ng-click="close()" ng-if="isRootModal"></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Modals/ModalDialogHeader.html','<div class="modal-header">    <a href="" class="close btn-icon"            ng-click="close()"             data-dismiss="modal"             aria-hidden="true">        <i class="fa fa-times"></i>    </a>    <h4 class="modal-title" ng-transclude></h4></div>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/NestedDataModels/EditNestedDataModelDialog.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        {{::title}}    </cms-modal-dialog-header>    <cms-form cms-name="mainForm" ng-submit="save()">        <cms-page-actions>            <cms-button cms-text="OK" ng-click="save()" class="main-cta" ng-disabled="mainForm.$invalid"></cms-button>            <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        </cms-page-actions>        <cms-page-body>            <cms-form-section cms-title="Settings">                <cms-form-dynamic-field-set cms-data-source="formDataSource"                                            cms-additional-parameters="additionalParameters">                </cms-form-dynamic-field-set>            </cms-form-section>        </cms-page-body>    </cms-form></cms-modal-dialog-container>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/NestedDataModels/FormFieldNestedDataModelCollection.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input type="hidden"                   id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   ng-model="vm.model"                   ng-change="vm.onChange()" />            <cms-table-container>                <table>                    <thead>                        <tr>                            <th ng-if="vm.previewFields.fields.previewImage"></th>                            <th ng-if="vm.previewFields.showTitle">{{vm.previewFields.titleTerm}}</th>                            <th ng-if="vm.previewFields.fields.previewDescription">{{vm.previewFields.fields.previewDescription.displayName}}</th>                            <th cms-table-column-actions                                ng-if="vm.formScope.editMode && !vm.readonly">Actions</th>                        </tr>                    </thead>                    <tbody>                         <tr ng-if="!vm.model.length">                            <td colspan="100" class="empty">None</td>                        </tr>                        <tr ng-repeat="entity in vm.model track by $index"                            ui-draggable="vm.formScope.editMode && vm.orderable"                            data-drag="entity"                            data-drag-channel="nested-model-{{vm.modelName}}"                            ui-on-drop="vm.onDrop($index, $data)"                            on-drop-success="vm.onDropSuccess($index)"                            data-drop-channel="nested-model-{{vm.modelName}}">                            <td ng-if="vm.previewFields.fields.previewImage">                                <cms-table-cell-image cms-image="vm.gridImages.images[$index]"></cms-table-cell-image>                            </td>                            <td ng-if="vm.previewFields.showTitle">                                <strong>{{vm.getTitle(entity, $index)}}</strong>                            </td>                            <td ng-if="vm.previewFields.fields.previewDescription">{{entity[vm.previewFields.fields.previewDescription.lowerName]}}</td>                            <td cms-table-column-actions ng-if="vm.formScope.editMode && !vm.readonly">                                <cms-button-icon cms-title="Edit"                                                 cms-icon="pencil"                                                 ng-click="vm.edit(entity, $index)">                                </cms-button-icon>                                <cms-button-icon cms-title="Remove"                                                 cms-icon="trash-o"                                                 ng-click="vm.remove(entity, $index)">                                </cms-button-icon>                            </td>                        </tr>                    </tbody>                </table>                <cms-table-actions>                    <a href="" class="btn-icon" title="Add"                       cms-icon="plus-circle"                       ng-click="vm.add()"                       ng-if="vm.formScope.editMode  && !vm.readonly && (!vm.maxItems || !vm.model || vm.model.length < vm.maxItems)"                       ng-disabled="vm.disabled">                        <i class="fa fa-plus-circle"></i>                    </a>                </cms-table-actions>            </cms-table-container>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/NestedDataModels/FormFieldNestedDataModelMultiTypeCollection.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input type="hidden"                   id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   ng-model="vm.model"                   ng-change="vm.onChange()" />            <cms-table-container>                <table>                    <thead>                        <tr>                            <th ng-if="vm.previewFields.showImage">{{vm.imageColumnHeader}}</th>                            <th ng-if="vm.previewFields.showTitle">{{vm.titleColumnHeader}}</th>                            <th ng-if="vm.previewFields.showDescription">{{vm.descriptionColumnHeader}}</th>                            <th>{{vm.typeColumnHeader}}</th>                            <th cms-table-column-actions                                ng-if="vm.formScope.editMode && !vm.readonly">Actions</th>                        </tr>                    </thead>                    <tbody>                         <tr ng-if="!vm.model.length">                            <td colspan="100" class="empty">None</td>                        </tr>                        <tr ng-repeat="item in vm.model track by $index"                            ui-draggable="vm.formScope.editMode && vm.orderable"                            data-drag="item"                            data-drag-channel="nested-model-{{vm.modelName}}"                            ui-on-drop="vm.onDrop($index, $data)"                            on-drop-success="vm.onDropSuccess($index)"                            data-drop-channel="nested-model-{{vm.modelName}}">                            <td ng-if="vm.previewFields.showImage">                                <cms-table-cell-image cms-image="vm.gridImages.images[$index]"></cms-table-cell-image>                            </td>                            <td ng-if="vm.previewFields.showTitle">                                <strong>{{vm.getTitle(item, $index)}}</strong>                            </td>                            <td ng-if="vm.previewFields.showDescription">{{item.model[vm.previewFields[item.typeName].fields.previewDescription.lowerName]}}</td>                            <td ng-if="vm.previewFields.showTitle">                                {{vm.modelMetaDataLookup[item.typeName].displayName}}                            </td>                            <td cms-table-column-actions ng-if="vm.formScope.editMode && !vm.readonly">                                <cms-button-icon cms-title="Edit"                                                 cms-icon="pencil"                                                 ng-click="vm.edit(item, $index)">                                </cms-button-icon>                                <cms-button-icon cms-title="Remove"                                                 cms-icon="trash-o"                                                 ng-click="vm.remove(item, $index)">                                </cms-button-icon>                            </td>                        </tr>                    </tbody>                </table>                <cms-table-actions ng-if="vm.formScope.editMode && !vm.readonly && (!vm.maxItems || !vm.model || vm.model.length < vm.maxItems)">                    <cms-menu cms-icon="plus-circle">                        <cms-button ng-repeat="(typeName, modelMetaData) in vm.modelMetaDataLookup"                                    cms-text="Add {{modelMetaData.displayName}}"                                    ng-click="vm.add(modelMetaData)"                                    ng-disabled="vm.gridLoadState.isLoading || vm.disabled"></cms-button>                    </cms-menu>                </cms-table-actions>            </cms-table-container>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Pages/FormFieldPageCollection.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input type="hidden"                   id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   ng-model="vm.model"                   ng-change="vm.onChange()" />            <cms-table-container cms-loading="vm.gridLoadState.isLoading">                <table>                    <thead>                        <tr>                            <th>Page</th>                            <th>Status</th>                            <th cms-table-column-actions                                ng-if="vm.formScope.editMode && !vm.readonly">Actions</th>                        </tr>                    </thead>                    <tbody>                        <tr ng-if="!vm.gridData.length">                            <td colspan="100" class="empty">None</td>                        </tr>                        <tr ng-repeat="page in vm.gridData track by $index"                            ui-draggable="vm.formScope.editMode && vm.orderable"                            data-drag="page"                            data-drag-channel="page-{{vm.modelName}}"                            ui-on-drop="vm.onDrop($index, $data)"                            data-drop-channel="page-{{vm.modelName}}">                            <td>                                <strong>                                    <a href="{{urlLibrary.pageDetails(page.pageId)}}"                                       target="_blank"                                       title="{{page.title}}">{{page.fullUrlPath }}</a>                                </strong>                            </td>                            <td>                                <span>{{page.getPublishStatusLabel()}}</span>                                <span ng-if="page.hasDraftVersion">(Pending Draft)</span>                            </td>                            <td cms-table-column-actions ng-if="vm.formScope.editMode && !vm.readonly">                                <cms-button-icon cms-title="Remove"                                                 cms-icon="trash-o"                                                 ng-click="vm.remove(page)">                                </cms-button-icon>                            </td>                        </tr>                    </tbody>                </table>                <cms-table-actions>                    <a href="" class="btn-icon" title="Add"                       cms-icon="plus-circle"                       ng-click="vm.showPicker()"                       ng-if="vm.formScope.editMode && !vm.readonly"                       ng-disabled="vm.gridLoadState.isLoading || vm.disabled">                        <i class="fa fa-plus-circle"></i>                    </a>                </cms-table-actions>            </cms-table-container>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline" ng-if="vm.description">        <small>{{vm.description}}</small>    </p></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Pages/FormFieldPageSelector.html','<cms-form-field-filtered-dropdown     cms-title="{{vm.title}}"    cms-model-name="{{vm.modelName}}"    cms-model="vm.model"    cms-required="vm.isRequired"    cms-readonly="vm.readonly"    cms-search-function="vm.search($query)"    cms-initial-item-function="vm.initialItemFunction(id)"    cms-option-name="fullUrlPath"    cms-option-value="pageId">    </cms-form-field-filtered-dropdown>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Pages/PagePickerDialog.html','<cms-modal-dialog-container cms-modal-size="large">    <cms-modal-dialog-header>        Find Page    </cms-modal-dialog-header>    <cms-page-actions>        <cms-button class="main-cta" cms-text="Ok" ng-click="onOk()"></cms-button>        <cms-button cms-text="Cancel" ng-click="onCancel()"></cms-button>        <!--FILTER-->        <cms-button cms-text="Filter"                    ng-click="toggleFilter()"></cms-button>        <cms-search-filter cms-query="query"                           cms-filter="filter"                           ng-show="isFilterVisible">            <cms-form-field-text cms-title="Text"                                 cms-model="filter.text"></cms-form-field-text>        </cms-search-filter>        <cms-pager cms-result="result"                   cms-query="query"></cms-pager>    </cms-page-actions>    <cms-page-body>        <cms-table-container cms-loading="gridLoadState.isLoading">            <table>                <thead>                    <tr>                        <th>Page</th>                        <th>Status</th>                        <th>Created</th>                        <th cms-table-column-actions>Actions</th>                    </tr>                </thead>                <tbody>                    <tr ng-if="result.items.length == 0">                        <td colspan="100" class="empty">Sorry, no pages could be found.</td>                    </tr>                    <tr ng-repeat="page in result.items"                        ng-class="(isSelected(page)) ? \'selected\' : \'selectable\'"                        ng-click="onSelect(page)"                        ng-dblclick="onSelectAndClose(page)">                        <td>                            <strong>                                <a href="{{::urlLibrary.pageDetails(page.pageId) }}"                                   target="_blank"                                   title="{{::page.title}}">{{::page.fullUrlPath }}</a>                            </strong>                        </td>                        <td>                            <span>{{::page.getPublishStatusLabel()}}</span>                            <span ng-if="::page.hasDraftVersion">(Pending Draft)</span>                        </td>                        <td class="lowPriority">                            <cms-table-cell-created-audit-data cms-audit-data="::page.auditData"></cms-table-cell-created-audit-data>                        </td>                        <td cms-table-column-actions>                            <a href="" ng-if="!isSelected(page)" class="btn-icon" title="Select">                                <i class="fa fa-square-o"></i>                            </a>                            <a href="" ng-if="isSelected(page)" class="btn-icon" title="Selected">                                <i class="fa fa-check-square-o"></i>                            </a>                        </td>                    </tr>                </tbody>            </table>        </cms-table-container>    </cms-page-body></cms-modal-dialog-container>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/Search/Pager.html','<div ng-if="vm.result && vm.result.pageCount > 1" class="pagination">    <button title="Previous page"            type="button"            class="btn pager previous"            ng-click="vm.setPage(vm.result.pageNumber - 1)"            ng-if="!vm.isFirstPage">        <i class="fa fa-chevron-left"></i>    </button>    <button title="Previous page"             type="button"            class="btn pager previous disabled"            ng-if="vm.isFirstPage"            disabled>        <i class="fa fa-chevron-left"></i>    </button>    <div class="info disabled">{{ vm.result.pageNumber }} of {{ vm.result.pageCount }}</div>    <button title="Next page"            type="button"            class="btn pager next"            ng-click="vm.setPage(vm.result.pageNumber + 1)"            ng-if="!vm.isLastPage">        <i class="fa fa-chevron-right"></i>    </button>    <button title="Next page"            type="button"            class="btn pager next disabled"            ng-if="vm.isLastPage"            disabled>        <i class="fa fa-chevron-right"></i>    </button></div>');
+t.put('/Admin/Modules/Shared/Js/UIComponents/Search/SearchFilter.html','<cms-form cms-name="searchFilterForm"          class="search-filter"          ng-submit="vm.setFilter()"          ng-show="vm.ngShow">    <form-section cms-title="Filter this list"                  ng-transclude>    </form-section>    <div class="form-actions">        <cms-button-submit cms-text="Apply"></cms-button-submit>        <cms-button cms-text="Clear"                    ng-click="vm.clear()"></cms-button>    </div></cms-form>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/StatusMessages/SuccessMessage.html','<p class="message success perm" ng-transclude></p>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/StatusMessages/WarningMessage.html','<p class="message warning perm" ng-transclude></p>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Table/TableActions.html','<div class="collection-actions" ng-transclude></div>');
@@ -84,6 +86,4 @@ t.put('/Admin/Modules/Shared/Js/UIComponents/Table/TableContainer.html','<div cl
 t.put('/Admin/Modules/Shared/Js/UIComponents/Tags/FormFieldTags.html','<div class="control-group">    <cms-field>        <label class="control-label" for="{{vm.modelName}}">{{vm.title}}:</label>        <div class="controls">            <input ng-show="vm.formScope.editMode && !vm.readonly"                   type="text"                   ng-model="vm.model"                   ng-change="vm.onChange()"                   id="{{vm.modelName}}"                   name="{{vm.modelName}}"                   cms-tags-input />            <span ng-if="!vm.formScope.editMode || vm.readonly">                <cms-tag-list cms-tags="vm.model"></cms-tag-list>            </span>            <div ng-hide="vm.formScope.editMode || vm.readonly" ng-if="!vm.model.length" class="text-block-display-value">None</div>            <cms-form-field-validation-summary></cms-form-field-validation-summary>        </div>    </cms-field>    <p class="help-inline">        <small>Separate each tag with a comma: dog, animal, canine. Used internally for searching for things.</small>    </p></div>');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Tags/TagList.html','<span>    <span ng-bind="tag"       ng-repeat-start="tag in tags"></span><span ng-repeat-end ng-if="!$last">, </span></span><!--<span ng-if="!isInModal">    <a href="/todo/tags/{{tag}}" class="tag"       ng-if="!isInModal"       ng-bind="tag"       ng-repeat-start="tag in tags"></a><span ng-repeat-end ng-if="!$last"> </span></span>-->');
 t.put('/Admin/Modules/Shared/Js/UIComponents/Time/TimeAgo.html','<time ng-if="vm.date"       datetime="{{vm.date}}"       title="{{vm.date | date:\'shortDate\'}} at {{vm.date | date:\'shortTime\'}}">{{vm.timeAgo}}</time>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/User/UserLink.html','<a ng-if="vm.user && vm.canRead"   cms-auto-target-blank   href="{{vm.urlLibrary.userDetails(vm.user.userArea, vm.user.userId)}}">{{vm.formatName(vm.user)}}</a><span ng-if="!vm.canRead">{{vm.formatName(vm.user)}}</span>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/Search/Pager.html','<div ng-if="vm.result && vm.result.pageCount > 1" class="pagination">    <button title="Previous page"            type="button"            class="btn pager previous"            ng-click="vm.setPage(vm.result.pageNumber - 1)"            ng-if="!vm.isFirstPage">        <i class="fa fa-chevron-left"></i>    </button>    <button title="Previous page"             type="button"            class="btn pager previous disabled"            ng-if="vm.isFirstPage"            disabled>        <i class="fa fa-chevron-left"></i>    </button>    <div class="info disabled">{{ vm.result.pageNumber }} of {{ vm.result.pageCount }}</div>    <button title="Next page"            type="button"            class="btn pager next"            ng-click="vm.setPage(vm.result.pageNumber + 1)"            ng-if="!vm.isLastPage">        <i class="fa fa-chevron-right"></i>    </button>    <button title="Next page"            type="button"            class="btn pager next disabled"            ng-if="vm.isLastPage"            disabled>        <i class="fa fa-chevron-right"></i>    </button></div>');
-t.put('/Admin/Modules/Shared/Js/UIComponents/Search/SearchFilter.html','<cms-form cms-name="searchFilterForm"          class="search-filter"          ng-submit="vm.setFilter()"          ng-show="vm.ngShow">    <form-section cms-title="Filter this list"                  ng-transclude>    </form-section>    <div class="form-actions">        <cms-button-submit cms-text="Apply"></cms-button-submit>        <cms-button cms-text="Clear"                    ng-click="vm.clear()"></cms-button>    </div></cms-form>');}]);
\ No newline at end of file
+t.put('/Admin/Modules/Shared/Js/UIComponents/User/UserLink.html','<a ng-if="vm.user && vm.canRead"   cms-auto-target-blank   href="{{vm.urlLibrary.userDetails(vm.user.userArea, vm.user.userId)}}">{{vm.formatName(vm.user)}}</a><span ng-if="!vm.canRead">{{vm.formatName(vm.user)}}</span>');}]);
\ No newline at end of file
diff --git a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/AddEntityAccessRuleController.js b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/AddEntityAccessRuleController.js
index e7388ae99..7015a81f6 100644
--- a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/AddEntityAccessRuleController.js
+++ b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/AddEntityAccessRuleController.js
@@ -81,7 +81,7 @@ function (
             vm.userAreas = _.filter(userAreas, function(userArea) { return userArea.userAreaCode !== 'COF' });
 
             if (vm.userAreas.length == 1) {
-                vm.command.userAreaCode = vm.userArea.userAreaCode;
+                vm.command.userAreaCode = vm.userAreas[0].userAreaCode;
             }
         }
     }
diff --git a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditor.html b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditor.html
index 9006355eb..9dae31efd 100644
--- a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditor.html
+++ b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditor.html
@@ -125,7 +125,7 @@
 
             </cms-form-section>
 
-            <cms-form-section cms-title="Violation Action">
+            <cms-form-section cms-title="Violation Action" ng-show="userAreasInRules.length">
 
                 <cms-form-field-container> 
                     <p>These options describe what should happen if the user is denied access.</p>
diff --git a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditorController.js b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditorController.js
index ba55920e1..729c65998 100644
--- a/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditorController.js
+++ b/src/Cofoundry.Web.Admin/Admin/Modules/Shared/Js/UIComponents/EntityAccess/EntityAccessEditorController.js
@@ -67,8 +67,8 @@ function (
 
             return command;
         });
-
-        if (!vm.command.redirectoToSignIn) {
+        
+        if (!vm.command.redirectToSignIn) {
             vm.command.userAreaCodeForSignInRedirect = null;
         }
 
@@ -203,7 +203,7 @@ function (
         
         if (accessRuleSet.userAreaForSignInRedirect) {
             command.userAreaCodeForSignInRedirect = accessRuleSet.userAreaForSignInRedirect.userAreaCode;
-            command.redirectoToSignIn = true;
+            command.redirectToSignIn = true;
         }
 
         return command;
@@ -219,17 +219,18 @@ function (
 
         if (!vm.userAreasInRules.length) {
             // all user areas have been removed from the list
-            vm.command.redirectoToSignIn = false;
+            vm.command.redirectToSignIn = false;
             vm.command.userAreaCodeForSignInRedirect = null;
         } else if (!_.find(vm.userAreasInRules, function(userArea) { return userArea.userAreaCode === vm.command.userAreaCodeForSignInRedirect; })) {
             // the selected user area has been removed from the list
-            vm.command.redirectoToSignIn = false;
+            vm.command.redirectToSignIn = false;
             vm.command.userAreaCodeForSignInRedirect = null;
         }
         
         if (!vm.command.userAreaCodeForSignInRedirect && vm.userAreasInRules.length) {
             // set a default selection in-case the list is hidden
             vm.command.userAreaCodeForSignInRedirect = vm.userAreasInRules[0].userAreaCode;
+        console.log('setting vm.command.userAreaCodeForSignInRedirect', vm.command.userAreaCodeForSignInRedirect);
         } 
     }