diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index ab51949dfb..4a25e41da0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -30,8 +30,7 @@
                                     no-dirty-check />
 
                                 <div class="form-search__toggle">
-                                    <umb-checkbox
-                                                  model="filterOptions.excludeSubFolders"
+                                    <umb-checkbox model="filterOptions.excludeSubFolders"
                                                   on-change="vm.toggle()"
                                                   text="Include subfolders in search"
                                                   label-key="general_excludeFromSubFolders">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
index 045a1403e2..b4e8d7fbe8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
@@ -45,7 +45,9 @@
             
                             <div>
                                 <div class="flex">
-                                    <umb-checkbox model="model.mandatoryRenderSection" text="{{vm.labels.sectionMandatory}}" />
+                                    <umb-checkbox model="model.mandatoryRenderSection"
+                                                  text="{{vm.labels.sectionMandatory}}">
+                                    </umb-checkbox>
                                 </div>
 
                                 <div class="umb-insert-code-box__description">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index b495cbc5c3..974f8d6b4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -14,8 +14,10 @@
 
             <ng-form name="changePasswordForm">
                 <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-if="vm.config.enableReset">
-                    <umb-checkbox model="vm.passwordValues.reset" server-validation-field="resetPassword"
-                                  on-change="vm.showReset = !vm.showReset" />
+                    <umb-checkbox model="vm.passwordValues.reset"
+                                  server-validation-field="resetPassword"
+                                  on-change="vm.showReset = !vm.showReset">
+                    </umb-checkbox>
                     <span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
                     </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 4cf4444cfe..71e19651d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -19,8 +19,8 @@
                                   name="publishVariantSelector"
                                   model="variant.publish"
                                   on-change="vm.changeSelection(variant)"
-                                  server-validation-field="{{variant.htmlId}}"
-                    >
+                                  server-validation-field="{{variant.htmlId}}">
+
                         <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                             <span ng-bind="variant.displayName"></span>
                             <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -38,6 +38,7 @@
                         <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                             <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                         </span>
+
                     </umb-checkbox>
 
                     <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
index 92373d00ff..fa118974d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
@@ -41,8 +41,8 @@
                             name="publishVariantSelector"
                             model="variant.publish"
                             on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                            server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -60,6 +60,7 @@
                             <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
+
                         </umb-checkbox>
 
                         <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
index dd6e96df95..c919a4ca0e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -18,13 +18,12 @@
                 <ng-form name="saveVariantSelectorForm">
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': saveVariantSelectorForm.saveVariantSelector.$invalid}">
 
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="saveVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                        <umb-checkbox input-id="{{variant.htmlId}}"
+                                      name="saveVariantSelector"
+                                      model="variant.save"
+                                      on-change="vm.changeSelection(variant)"
+                                      server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -42,6 +41,7 @@
                             <span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
                             </span>
+
                         </umb-checkbox>
 
                         <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 28795c9272..404accf57c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -88,13 +88,12 @@
                 <ng-form name="scheduleSelectorForm" style="width:100%;">
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid}">
 
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="saveVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                        <umb-checkbox input-id="{{variant.htmlId}}"
+                                      name="saveVariantSelector"
+                                      model="variant.save"
+                                      on-change="vm.changeSelection(variant)"
+                                      server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -109,12 +108,10 @@
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                             </span>
+
                         </umb-checkbox>
 
                         <div>
-
-
-
                             <div class="date-wrapper-mini date-wrapper-mini--checkbox">
                                 <div class="date-wrapper-mini__date" ng-if="(variant.releaseDate || variant.save)">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
index 91fa1799fc..abf39c6542 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
@@ -15,11 +15,11 @@
                 <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
 
                     <umb-checkbox input-id="{{variant.htmlId}}"
-                        name="publishVariantSelector"
-                        model="variant.publish"
-                        on-change="vm.changeSelection(variant)"
-                        server-validation-field="{{variant.htmlId}}"
-                    >
+                                  name="publishVariantSelector"
+                                  model="variant.publish"
+                                  on-change="vm.changeSelection(variant)"
+                                  server-validation-field="{{variant.htmlId}}">
+
                         <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                             <span ng-bind="variant.displayName"></span>
                             <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -37,6 +37,7 @@
                         <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                             <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                         </span>
+
                     </umb-checkbox>
 
                     <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
index 94dd9fdac5..4496956d79 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
@@ -17,14 +17,13 @@
                 <ng-form name="unpublishVariantSelectorForm">
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': unpublishVariantSelectorForm.unpublishVariantSelector.$invalid}">
 
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="unpublishVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            disabled="variant.disabled"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                        <umb-checkbox input-id="{{variant.htmlId}}"
+                                      name="unpublishVariantSelector"
+                                      model="variant.save"
+                                      on-change="vm.changeSelection(variant)"
+                                      disabled="variant.disabled"
+                                      server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -42,6 +41,7 @@
                             <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
+
                         </umb-checkbox>
 
                         <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
index bdce1723a0..a64280669f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
@@ -106,8 +106,7 @@
 
                         </div>
 
-                        <umb-checkbox model="vm.confirmed" text="{{vm.labels.deleteConfirm}}">
-                        </umb-checkbox>
+                        <umb-checkbox model="vm.confirmed" text="{{vm.labels.deleteConfirm}}"></umb-checkbox>
 
                     </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 5aba520b9b..e824608dd1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -86,7 +86,9 @@
                     <umb-checkbox ng-if="model.disableTemplates === false"
                                   name="collectionCreateTemplate"
                                   model="model.collectionCreateTemplate"
-                                  text="Create template for the Parent Document Type" />
+                                  text="Create template for the Parent Document Type">
+                    </umb-checkbox>
+
                 </umb-control-group>
 
                 <umb-control-group>
@@ -96,7 +98,9 @@
                     <umb-checkbox ng-if="model.disableTemplates === false"
                                   name="collectionItemCreateTemplate"
                                   model="model.collectionItemCreateTemplate"
-                                  text="Create template for the Item Document Type" />
+                                  text="Create template for the Item Document Type">
+                    </umb-checkbox>
+
                 </umb-control-group>
 
                 <div class="mt3">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
index e7fdf4f96e..8472801288 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
@@ -28,8 +28,7 @@
 
                 <hr />
 
-                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}">
-                </umb-checkbox>
+                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
 
                 <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
                 </umb-confirm>
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
index 77811acd3a..a5278138ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -37,7 +37,12 @@
                             <umb-dropdown class="pull-left" ng-if="vm.page.showLevelFilter" on-close="vm.page.showLevelFilter = false;">
                                 <umb-dropdown-item ng-repeat="level in vm.logLevels" class="dropdown-item">
                                     <div class="flex items-center">
-                                        <umb-checkbox input-id="loglevel-{{$index}}" name="loglevel" model="level.selected" on-change="vm.setLogLevelFilter(level)"></umb-checkbox>
+                                        <umb-checkbox input-id="loglevel-{{$index}}"
+                                                      name="loglevel"
+                                                      model="level.selected"
+                                                      on-change="vm.setLogLevelFilter(level)">
+                                        </umb-checkbox>
+
                                         <label for="loglevel-{{$index}}">
                                             <umb-badge size="s" color="{{level.logTypeColor}}">{{level.name}}</umb-badge>
                                         </label>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
index fb0c4c3a52..de41b6a21f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
@@ -24,8 +24,7 @@
 
                 <hr />
 
-                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}">
-                </umb-checkbox>
+                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
 
                 <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
                 </umb-confirm>
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
index d87b6737f4..1939b9e659 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
@@ -13,8 +13,7 @@
 
         <hr />
 
-        <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}">
-        </umb-checkbox>
+        <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
 
         <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
         </umb-confirm>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
index 0dfaf0a1fc..32738ac7fb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
@@ -122,25 +122,27 @@
                                 on-remove="vm.removeContentItem()">
                             </umb-node-preview>
 
-                            <a href=""
-                                ng-if="!vm.package.contentNodeId"
-                                style="margin-bottom: 10px;"
-                                class="umb-node-preview-add"
-                                ng-click="vm.openContentPicker()"
-                                prevent-default>
+                            <button type="button"
+                                    ng-if="!vm.package.contentNodeId"
+                                    style="margin-bottom: 10px;"
+                                    class="umb-node-preview-add"
+                                    ng-click="vm.openContentPicker()">
                                 <localize key="general_add">Add</localize>
-                            </a>
+                            </button>
+
+                            <umb-checkbox model="vm.package.contentLoadChildNodes"
+                                            disabled="!vm.package.contentNodeId"
+                                            text="{{vm.labels.includeAllChildNodes}}">
+                            </umb-checkbox>
 
-                                <umb-checkbox model="vm.package.contentLoadChildNodes"
-                                                disabled="!vm.package.contentNodeId"
-                                                text="{{vm.labels.includeAllChildNodes}}" />
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_documentTypes">
                             <div ng-repeat="doctype in ::vm.documentTypes | orderBy:'name'">
-                                    <umb-checkbox model="doctype.selected"
-                                                  on-change="vm.selectDocumentType(doctype)"
-                                                  text="{{doctype.name}}" />
+                                <umb-checkbox model="doctype.selected"
+                                                on-change="vm.selectDocumentType(doctype)"
+                                                text="{{doctype.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
@@ -148,7 +150,8 @@
                             <div ng-repeat="template in ::vm.templates | orderBy:'name'">
                                     <umb-checkbox model="template.selected"
                                                   on-change="vm.selectTemplate(template)"
-                                                  text="{{template.name}}" />
+                                                  text="{{template.name}}">
+                                    </umb-checkbox>
                             </div>
                         </umb-control-group>
 
@@ -156,39 +159,44 @@
                             <div ng-repeat="stylesheet in ::vm.stylesheets | orderBy:'name'">
                                     <umb-checkbox model="stylesheet.selected"
                                                   on-change="vm.selectStyleSheet(stylesheet)"
-                                                  text="{{stylesheet.path}}" />
+                                                  text="{{stylesheet.path}}">
+                                    </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_macros">
                             <div ng-repeat="macro in ::vm.macros | orderBy:'name'">
-                                    <umb-checkbox model="macro.selected"
-                                                  on-change="vm.selectMacro(macro)"
-                                                  text="{{macro.name}}" />
+                                <umb-checkbox model="macro.selected"
+                                                on-change="vm.selectMacro(macro)"
+                                                text="{{macro.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_languages">
                             <div ng-repeat="language in ::vm.languages | orderBy:'name'">
-                                    <umb-checkbox model="language.selected"
-                                                  on-change="vm.selectLanguage(language)"
-                                                  text="{{language.name}}" />
+                                <umb-checkbox model="language.selected"
+                                                on-change="vm.selectLanguage(language)"
+                                                text="{{language.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_dictionary">
                             <div ng-repeat="dictionaryItem in ::vm.dictionaryItems | orderBy:'name'">
-                                    <umb-checkbox model="dictionaryItem.selected"
-                                                  on-change="vm.selectDictionaryItem(dictionaryItem)"
-                                                  text="{{dictionaryItem.name}}" />
+                                <umb-checkbox model="dictionaryItem.selected"
+                                                on-change="vm.selectDictionaryItem(dictionaryItem)"
+                                                text="{{dictionaryItem.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_dataTypes">
                             <div ng-repeat="dataType in ::vm.dataTypes | orderBy:'name'">
-                                    <umb-checkbox model="dataType.selected"
-                                                  on-change="vm.selectDataType(dataType)"
-                                                  text="{{dataType.name}}" />
+                                <umb-checkbox model="dataType.selected"
+                                                on-change="vm.selectDataType(dataType)"
+                                                text="{{dataType.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index b3d6d5990b..96de0cd040 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -2,12 +2,13 @@
 
     <umb-control-group label="Toolbar" description="Pick the toolbar options that should be available when editing">
         <div ng-repeat="cmd in tinyMceConfig.commands">
-                <umb-checkbox
-                    model="cmd.selected"
-                    on-change="selectCommand(cmd)"
-                    icon="{{cmd.icon}}"
-                    text="{{cmd.name}}"
-                    class="mce-cmd" />
+            <umb-checkbox
+                model="cmd.selected"
+                on-change="selectCommand(cmd)"
+                icon="{{cmd.icon}}"
+                text="{{cmd.name}}"
+                class="mce-cmd">
+            </umb-checkbox>
         </div>
     </umb-control-group>
 
@@ -17,7 +18,9 @@
             <umb-checkbox
                 model="css.selected"
                 on-change="selectStylesheet(css)"
-                text="{{css.name}}"/>
+                text="{{css.name}}">
+            </umb-checkbox>
+
         </div>
     </umb-control-group>