diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 6aafece55..238b77d4e 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -578,6 +578,12 @@
 }
 .control-simplelist {
   font-size: 13px;
+  padding: 20px 20px 2px 20px;
+  margin-bottom: 25px;
+  background: #ffffff;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
 }
 .control-simplelist ul {
   padding-left: 15px;
@@ -596,6 +602,18 @@
   list-style-type: none;
   padding-left: 0;
 }
+.control-simplelist.with-checkboxes li {
+  margin-top: -5px;
+}
+.control-simplelist.with-checkboxes li:first-child {
+  margin-top: 0;
+}
+.control-simplelist.with-checkboxes li:last-child div.custom-checkbox {
+  margin-bottom: 0;
+}
+.control-simplelist.with-checkboxes li:last-child div.custom-checkbox label {
+  margin-bottom: 5px;
+}
 .control-simplelist.is-sortable li.placeholder {
   position: relative;
 }
@@ -2837,6 +2855,9 @@ body {
 .layout > .layout-row > .layout-cell.width-120 {
   width: 120px;
 }
+.layout > .layout-row > .layout-cell.width-140 {
+  width: 140px;
+}
 .layout > .layout-row > .layout-cell.width-200 {
   width: 200px;
 }
@@ -2882,6 +2903,9 @@ body {
 .layout > .layout-row > .layout-cell.width-120 {
   width: 120px;
 }
+.layout > .layout-row > .layout-cell.width-140 {
+  width: 140px;
+}
 .layout > .layout-row > .layout-cell.width-200 {
   width: 200px;
 }
@@ -2935,6 +2959,9 @@ body {
 .layout > .layout-cell.width-120 {
   width: 120px;
 }
+.layout > .layout-cell.width-140 {
+  width: 140px;
+}
 .layout > .layout-cell.width-200 {
   width: 200px;
 }
@@ -3516,7 +3543,6 @@ body.mainmenu-open .mainmenu-collapsed ul {
   position: absolute;
   height: 100%;
   width: 100%;
-  padding: 10px 0;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
@@ -3528,17 +3554,38 @@ body.mainmenu-open .mainmenu-collapsed ul {
   height: 100%;
   overflow: hidden;
 }
+#layout-sidenav ul:after {
+  content: '';
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 10px;
+  height: 100%;
+  -webkit-box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
+  box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
+}
 #layout-sidenav ul li {
   display: block;
   text-align: center;
   position: relative;
 }
 #layout-sidenav ul li a {
-  padding: 13px;
+  padding: 20px 13px;
   display: block;
-  font-size: 12px;
+  font-size: 15px;
   color: rgba(255, 255, 255, 0.35);
   font-weight: normal;
+  position: relative;
+}
+#layout-sidenav ul li a:after {
+  content: '';
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 10px;
+  height: 100%;
+  -webkit-box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
+  box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
 }
 #layout-sidenav ul li a:hover {
   text-decoration: none;
@@ -3555,6 +3602,7 @@ body.mainmenu-open .mainmenu-collapsed ul {
 }
 #layout-sidenav ul li.active a,
 #layout-sidenav ul li a:hover {
+  background: #1f99dc;
   color: #ffffff;
 }
 #layout-sidenav ul li.active a i,
@@ -3589,45 +3637,6 @@ body.mainmenu-open .mainmenu-collapsed ul {
   -ms-transform: scale(0, );
   transform: scale(0, );
 }
-#layout-sidenav .scroll-marker {
-  position: absolute;
-  left: 0;
-  width: 100%;
-  height: 10px;
-  display: none;
-}
-#layout-sidenav .scroll-marker:after {
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  text-decoration: inherit;
-  -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
-  content: "\f141";
-  display: block;
-  position: absolute;
-  left: 50%;
-  margin-left: -3px;
-  top: 0;
-  height: 9px;
-  font-size: 10px;
-  color: rgba(255, 255, 255, 0.35);
-}
-#layout-sidenav .scroll-marker.before {
-  top: 0;
-}
-#layout-sidenav .scroll-marker.after {
-  bottom: 3px;
-}
-#layout-sidenav .scroll-marker.after:after {
-  top: 2px;
-}
-#layout-sidenav.scroll-before .scroll-marker.before {
-  display: block;
-}
-#layout-sidenav.scroll-after .scroll-marker.after {
-  display: block;
-}
 #layout-sidenav.layout-sidenav ul.drag li:not(.active) a:hover,
 .touch #layout-sidenav.layout-sidenav li:not(.active) a:hover {
   color: rgba(255, 255, 255, 0.35) !important;
diff --git a/modules/backend/assets/less/controls/simplelist.less b/modules/backend/assets/less/controls/simplelist.less
index 989179b7f..ff90ad983 100644
--- a/modules/backend/assets/less/controls/simplelist.less
+++ b/modules/backend/assets/less/controls/simplelist.less
@@ -48,8 +48,11 @@
 //
 
 .control-simplelist {
-
     font-size: 13px;
+    padding: 20px 20px 2px 20px;
+    margin-bottom: @padding-standard;
+    background: @color-form-checkboxlist-background;
+    .border-radius(@border-radius-base);
 
     ul { padding-left: 15px; }
 
@@ -71,7 +74,25 @@
         }
     }
 
-    &.with-checkboxes {}
+    &.with-checkboxes {
+        li {
+            margin-top: -5px;
+
+            &:first-child {
+                margin-top: 0;
+            }
+
+            &:last-child {
+                div.custom-checkbox {
+                    margin-bottom: 0;
+
+                    label {
+                        margin-bottom: 5px;
+                    }
+                }
+            }
+        }
+    }
 
     &.is-sortable {
 
diff --git a/modules/backend/assets/less/core/variables.less b/modules/backend/assets/less/core/variables.less
index 563056828..469755446 100644
--- a/modules/backend/assets/less/core/variables.less
+++ b/modules/backend/assets/less/core/variables.less
@@ -31,6 +31,7 @@
 
 @color-sidebarnav-bg:                        #31495F;
 @color-sidebarnav-active-text:               #ffffff;
+@color-sidebarnav-active-bg:                 #1f99dc;
 @color-sidebarnav-active-icon:               #ffffff;
 @color-sidebarnav-inactive-text:             rgba(255,255,255,.35);
 @color-sidebarnav-inactive-icon:             rgba(255,255,255,.35);
diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less
index 08df8e380..365ed27cb 100644
--- a/modules/backend/assets/less/layout/layout.less
+++ b/modules/backend/assets/less/layout/layout.less
@@ -74,6 +74,7 @@ body {
 
         &.width-100 { width: 100px; }
         &.width-120 { width: 120px; }
+        &.width-140 { width: 140px; }
         &.width-200 { width: 200px; }
         &.width-300 { width: 300px; }
 
diff --git a/modules/backend/assets/less/layout/sidenav.less b/modules/backend/assets/less/layout/sidenav.less
index d4168a3c5..6b5100f1b 100644
--- a/modules/backend/assets/less/layout/sidenav.less
+++ b/modules/backend/assets/less/layout/sidenav.less
@@ -3,18 +3,21 @@
 // --------------------------------------------------
 
 #layout-sidenav {
-    .virtualFullHeight() {
-        content: ' ';
+    .sidenav-shadow-element() {
+        content: '';
         position: absolute;
         height: 100%;
         top: 0;
+        right: 0;
+        width: 10px;
+        height: 100%;
+        .box-shadow(inset -5px 0 3px rgba(0,0,0,0.1));
     }
 
     background-color: @color-sidebarnav-bg;
     position: absolute;
     height: 100%;
     width: 100%;
-    padding: 10px 0;
 
     .box-sizing(border-box);
 
@@ -25,17 +28,26 @@
         height: 100%;
         overflow: hidden;
 
+        &:after {
+            .sidenav-shadow-element();
+        }
+
         li {
             display: block;
             text-align: center;
             position: relative;
 
             a {
-                padding: 13px;
+                padding: 20px 13px;
                 display: block;
-                font-size: 12px;
+                font-size: 15px;
                 color: @color-sidebarnav-inactive-text;
                 font-weight: normal;
+                position: relative;
+
+                &:after {
+                    .sidenav-shadow-element();
+                }
 
                 &:hover {
                     text-decoration: none;
@@ -55,6 +67,8 @@
             }
 
             &.active a, a:hover {
+                background: @color-sidebarnav-active-bg;
+
                 color: @color-sidebarnav-active-text;
                 i { color: @color-sidebarnav-active-icon; }
             }
@@ -81,8 +95,6 @@
             }
         }
     }
-
-    .vertical-scroll-marker(@color-sidebarnav-inactive-icon);
 }
 
 #layout-sidenav.layout-sidenav ul.drag li:not(.active) a:hover,
diff --git a/modules/backend/formwidgets/PermissionEditor.php b/modules/backend/formwidgets/PermissionEditor.php
index a024dce7b..a7bc8c805 100644
--- a/modules/backend/formwidgets/PermissionEditor.php
+++ b/modules/backend/formwidgets/PermissionEditor.php
@@ -38,7 +38,7 @@ class PermissionEditor extends FormWidgetBase
      */
     public function prepareVars()
     {
-        $this->vars['mode'] = $this->getControlMode();
+        $this->vars['checkboxMode'] = $this->getControlMode() === 'checkbox';
 
         $this->vars['permissions'] = BackendAuth::listTabbedPermissions();
         $this->vars['baseFieldName'] = $this->formField->getName();
@@ -70,6 +70,7 @@ class PermissionEditor extends FormWidgetBase
     protected function loadAssets()
     {
         $this->addCss('css/permissioneditor.css', 'core');
+        $this->addJs('js/permissioneditor.js', 'core');
     }
 
     protected function getControlMode()
diff --git a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css
index af3049327..3ac87d150 100644
--- a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css
+++ b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css
@@ -1,5 +1,6 @@
 .permissioneditor {
   position: relative;
+  margin: 0 -25px;
 }
 .permissioneditor.control-disabled .permissions-overlay {
   position: absolute;
@@ -34,12 +35,17 @@
   padding: 10px 4px;
   vertical-align: top;
   border-bottom: 1px solid #ecf0f1;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 .permissioneditor table td.permission-value {
   text-align: center;
 }
 .permissioneditor table td.permission-name {
   font-size: 14px;
+  cursor: pointer;
   color: #555555;
 }
 .permissioneditor table td p.comment {
@@ -49,13 +55,19 @@
 .permissioneditor table td p.comment:empty {
   display: none;
 }
+.permissioneditor table tr:hover td {
+  background: #4da7e8;
+}
+.permissioneditor table tr:hover td.permission-name {
+  color: #ffffff!important;
+}
 .permissioneditor table th:first-child,
 .permissioneditor table td:first-child {
-  padding-left: 0;
+  padding-left: 25px;
 }
 .permissioneditor table th:last-child,
 .permissioneditor table td:last-child {
-  padding-right: 0;
+  padding-right: 5px;
 }
 .permissioneditor table .custom-radio,
 .permissioneditor table .custom-checkbox {
@@ -72,7 +84,7 @@
 .permissioneditor table .custom-checkbox label {
   padding: 0 0 0 14px;
   margin: 0;
-  top: 2px;
+  top: 0;
 }
 .permissioneditor table .custom-radio label span,
 .permissioneditor table .custom-checkbox label span {
@@ -89,7 +101,9 @@
 .permissioneditor table tr:first-child th {
   padding-top: 0;
 }
+.permissioneditor table tr.disabled td.permission-name {
+  color: #AAA;
+}
 .permissioneditor table tr.last-section-row td {
   border-bottom: none;
-  padding-bottom: 0;
 }
diff --git a/modules/backend/formwidgets/permissioneditor/assets/js/permissioneditor.js b/modules/backend/formwidgets/permissioneditor/assets/js/permissioneditor.js
new file mode 100644
index 000000000..d5716b369
--- /dev/null
+++ b/modules/backend/formwidgets/permissioneditor/assets/js/permissioneditor.js
@@ -0,0 +1,73 @@
++function ($) { "use strict";
+
+    var Base = $.oc.foundation.base,
+        BaseProto = Base.prototype
+
+    var PermissionEditor = function() {
+        Base.call(this)
+
+        this.init()
+    }
+
+    PermissionEditor.prototype = Object.create(BaseProto)
+    PermissionEditor.prototype.constructor = PermissionEditor
+
+    PermissionEditor.prototype.init = function() {
+        $(document).on('click', '.permissioneditor table td.permission-name', this.proxy(this.onPermissionNameClick))
+        $(document).on('click', '.permissioneditor table tr.mode-checkbox input[type=checkbox]', this.proxy(this.onPermissionCheckboxClick))
+        $(document).on('click', '.permissioneditor table tr.mode-radio input[type=radio]', this.proxy(this.onPermissionRadioClick))
+    }
+
+    // EVENT HANDLERS
+    // ============================
+
+    PermissionEditor.prototype.onPermissionNameClick = function(ev) {
+        var $row = $(ev.target).closest('tr'),
+            $checkbox = $row.find('input[type=checkbox]')
+
+        if ($checkbox.length) {
+            $checkbox.trigger('click')
+        }
+        else {
+            var $radios = $row.find('input[type=radio]')
+
+            if ($radios.length != 3) {
+                return
+            }
+
+            var nextIndex = 0
+            for (var i=2; i>=0; i--) {
+                if ($radios.get(i).checked) {
+                    nextIndex = i+1;
+                    break
+                }
+            }
+
+            if (nextIndex > 2) {
+                nextIndex = 0
+            }
+
+            $($radios.get(nextIndex)).trigger('click')
+        }
+    }
+
+    PermissionEditor.prototype.onPermissionCheckboxClick = function(ev) {
+        var $row = $(ev.target).closest('tr')
+
+        $row.toggleClass('disabled', !ev.target.checked)
+    }
+
+    PermissionEditor.prototype.onPermissionRadioClick = function(ev) {
+        var $row = $(ev.target).closest('tr')
+
+        $row.toggleClass('disabled', ev.target.value == -1)
+    }
+
+    // INITIALIZATION
+    // ============================
+
+    $(document).ready(function(){
+        new PermissionEditor()
+    })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less b/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less
index 1b1eb264e..7bd661a21 100644
--- a/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less
+++ b/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less
@@ -7,6 +7,8 @@
 .permissioneditor {
     position: relative;
 
+    margin: 0 -(@padding-standard);
+
     &.control-disabled {
         .permissions-overlay {
             position: absolute;
@@ -40,14 +42,13 @@
                 font-size: 15px;
                 text-align: center;
             }
-
-
         }
 
         td {
             padding: 10px 4px;
             vertical-align: top;
             border-bottom: 1px solid @color-permissioneditor-permission-border; 
+            .user-select(none);
 
             &.permission-value{
                 text-align: center;
@@ -55,6 +56,7 @@
 
             &.permission-name {
                 font-size: 14px;
+                cursor: pointer;
                 color: @color-help-block-text;
             }
 
@@ -68,13 +70,23 @@
             }
         }
 
+        tr:hover {
+            td {
+                background: @color-list-hover-bg;
+
+                &.permission-name {
+                    color: #ffffff!important;
+                }
+            }
+        }
+
         th, td {
             &:first-child {
-                padding-left: 0;
+                padding-left: @padding-standard;
             }
 
             &:last-child {
-                padding-right: 0;
+                padding-right: 5px;
             }
         }
 
@@ -90,7 +102,7 @@
             label {
                 padding: 0 0 0 14px;
                 margin: 0;
-                top: 2px;
+                top: 0;
 
                 span {
                     text-indent: -10000em;
@@ -111,10 +123,15 @@
             padding-top: 0;
         }
 
+        tr.disabled {
+            td.permission-name {
+                color: #AAA;
+            }
+        }
+
         tr.last-section-row {
             td {
                 border-bottom: none;
-                padding-bottom: 0;
             }
         }
     }
diff --git a/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm b/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm
index 5f33d3bcb..cd28edaf7 100644
--- a/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm
+++ b/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm
@@ -8,10 +8,12 @@
                 <th class="tab"><?= e(trans($tab)) ?></th>
                 <th class="permission-type"><?= $firstTab ? e(Lang::get('backend::lang.user.allow')) : '' ?></th>
 
-                <?php if ($mode === 'radio'): ?>
+                <?php if (!$checkboxMode): ?>
                     <th class="permission-type"><?= $firstTab ? e(Lang::get('backend::lang.user.inherit')) : '' ?></th>
                     <th class="permission-type"><?= $firstTab ? e(Lang::get('backend::lang.user.deny')) : '' ?></th>
                 <?php endif ?>
+
+                <th></th>
             </tr>
 
             <?php 
@@ -19,7 +21,7 @@
                 foreach ($tabPermissions as $index=>$permission): 
                     $globalIndex++;
 
-                    if ($mode === 'radio') {
+                    if (!$checkboxMode) {
                         $permissionValue = array_key_exists($permission->code, $permissionsData) ? 
                            $permissionsData[$permission->code] : 0;
                     } 
@@ -27,14 +29,18 @@
                         $isChecked = array_key_exists($permission->code, $permissionsData);
                     }
                 ?> 
-                <tr class="<?= $lastIndex == $index ? 'last-section-row' : '' ?>">
+                <tr class="<?= $lastIndex == $index ? 'last-section-row' : '' ?>
+                        <?= $checkboxMode ? 'mode-checkbox' : 'mode-radio' ?>
+                        <?= $checkboxMode && !$isChecked ? 'disabled' : '' ?>
+                        <?= !$checkboxMode && $permissionValue == -1 ? 'disabled' : '' ?>
+                    ">
                     <td class="permission-name">
                         <?= e(trans($permission->label)) ?>
 
                         <p class="comment"><?= e(trans($permission->comment)) ?></p>
                     </td>
                     <td class="permission-value">
-                        <?php if ($mode === 'radio'): ?>
+                        <?php if (!$checkboxMode): ?>
                             <div class="radio custom-radio">
                                  <input
                                     id="<?= 'permission-'.$globalIndex.'-allow' ?>"
@@ -62,7 +68,7 @@
                         <?php endif?>
                     </td>
 
-                    <?php if ($mode === 'radio'): ?>
+                    <?php if (!$checkboxMode): ?>
                         <td class="permission-value">
                             <div class="radio custom-radio">
                                  <input
@@ -91,6 +97,8 @@
                             </div>
                         </td>
                     <?php endif ?>
+
+                    <td></td>
                 </tr>
             <?php endforeach ?>
         <?php 
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index ee07af66d..824ab1a76 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -107,7 +107,7 @@ return [
             'is_new_user_default_field_label' => 'Default group',
             'is_new_user_default_field_comment' => 'Add new administrators to this group by default',
             'code_field' => 'Code',
-            'code_comment' => 'Enter a unique code if you want to access it with the API.',
+            'code_comment' => 'Enter a unique code if you want to access the group object with the API.',
             'menu_label' => 'Groups',
             'list_title' => 'Manage Groups',
             'new' => 'New Group',
diff --git a/modules/backend/layouts/_sidenav.htm b/modules/backend/layouts/_sidenav.htm
index fa7c7ceb3..2c1f805d7 100644
--- a/modules/backend/layouts/_sidenav.htm
+++ b/modules/backend/layouts/_sidenav.htm
@@ -7,7 +7,7 @@
         $sideMenuItems = BackendMenu::listSideMenuItems();
     ?>
     <?php if ($sideMenuItems): ?>
-        <div class="layout-cell width-120">
+        <div class="layout-cell width-140">
             <div class="layout-relative">
                 <nav class="layout-sidenav" id="layout-sidenav" data-control="sidenav">
                     <ul class="nav">
diff --git a/modules/backend/widgets/lists/partials/_setup_form.htm b/modules/backend/widgets/lists/partials/_setup_form.htm
index fe287d5b6..acf636069 100644
--- a/modules/backend/widgets/lists/partials/_setup_form.htm
+++ b/modules/backend/widgets/lists/partials/_setup_form.htm
@@ -4,7 +4,7 @@
         <h4 class="modal-title"><?= e(trans('backend::lang.list.setup_title')) ?></h4>
     </div>
     <div class="modal-body">
-        <p><?= e(trans('backend::lang.list.setup_help')) ?></p>
+        <p class="help-block before-field"><?= e(trans('backend::lang.list.setup_help')) ?></p>
 
         <div class="control-simplelist with-checkboxes is-sortable" data-control="simplelist">
             <ul>
@@ -35,7 +35,7 @@
         <?php if ($this->showPagination): ?>
             <div class="form-group">
                 <label><?= e(trans('backend::lang.list.records_per_page')) ?></label>
-                <p class="help-block">
+                <p class="help-block before-field">
                     <?= e(trans('backend::lang.list.records_per_page_help')) ?>
                 </p>
                 <select class="form-control custom-select select-no-search" name="records_per_page">
diff --git a/modules/system/assets/ui/less/filter.less b/modules/system/assets/ui/less/filter.less
index 4b0b269ba..b9b47601b 100644
--- a/modules/system/assets/ui/less/filter.less
+++ b/modules/system/assets/ui/less/filter.less
@@ -10,9 +10,9 @@
 // Filters
 // --------------------------------------------------
 
-@color-filter-bg:                            #f3f3f3;
-@color-filter-bg-active:                     #cc3300;
-@color-filter-border:                        #949ea6;
+@color-filter-bg:                            #ECF0F1;
+@color-filter-bg-active:                     #6AAB55;
+@color-filter-border:                        #D7DBDD;
 @color-filter-text:                          #949ea6;
 @color-filter-items-bg:                      #fafafa;
 @color-filter-items-bg-hover:                #4da7e8;
@@ -23,7 +23,7 @@
 
 .control-filter {
     padding: 0 10px;
-    font-size: 13px;
+    font-size: 15px;
     color: @color-filter-text;
     background-color: @color-filter-bg;
     border-top: 1px solid @color-filter-border;
@@ -36,9 +36,12 @@
     > .filter-scope {
         display: inline-block;
         padding: 15px;
-        .filter-label {}
+        .filter-label {
+            margin-right: 5px;
+        }
         .filter-setting {
             display: inline-block;
+            margin-right: 5px;
             .transition(color 0.6s);
         }
 
@@ -64,6 +67,10 @@
                 margin-bottom: 0;
             }
 
+            label {
+                padding-left: 30px;
+            }
+
             &:after {
                 content: '';
             }
@@ -101,7 +108,7 @@
 
     .filter-items, .filter-active-items {
         color: @color-filter-text;
-        font-size: 13px;
+        font-size: 14px;
         ul, li {
             list-style-type: none;
             margin:0;
diff --git a/modules/system/assets/ui/less/list.less b/modules/system/assets/ui/less/list.less
index 10ef3f210..88457cd38 100644
--- a/modules/system/assets/ui/less/list.less
+++ b/modules/system/assets/ui/less/list.less
@@ -79,6 +79,10 @@ table.table.data {
         tr th:last-child a {
             padding-right: 25px;
         }
+
+        .list-checkbox .custom-checkbox {
+            top: -20px;
+        }
     }
 
     tbody {
@@ -271,14 +275,17 @@ table.table.data {
         .checkbox { margin: 0; }
         .custom-checkbox {
             position: relative;
-            top: 5px;
+            top: -14px;
             left: -2px;
-            label { margin-right: 0; }
+            label { 
+                margin-right: 0;
+                margin-bottom: 0;
+            }
         }
     }
 
     thead tr th.list-checkbox {
-        padding: 18px 0 0 20px;
+        padding: 18px 0 0 @padding-standard;
     }
 
     .list-tree {
diff --git a/modules/system/assets/ui/less/popup.base.less b/modules/system/assets/ui/less/popup.base.less
index 86442bc0c..c38e04324 100644
--- a/modules/system/assets/ui/less/popup.base.less
+++ b/modules/system/assets/ui/less/popup.base.less
@@ -74,7 +74,7 @@
 // Modal header
 // Top section of the modal w/ title and dismiss
 .modal-header {
-    padding: @modal-title-padding;
+    padding: @modal-title-padding @padding-standard;
     border-bottom: 1px solid @modal-header-border-color;
     min-height: (@modal-title-padding + @modal-title-line-height);
 }
@@ -93,7 +93,7 @@
 // Where all modal content resides (sibling of .modal-header and .modal-footer)
 .modal-body {
     position: relative;
-    padding: @modal-inner-padding;
+    padding: @modal-inner-padding @padding-standard;
 }
 
 // Footer (for actions)
diff --git a/modules/system/assets/ui/less/popup.less b/modules/system/assets/ui/less/popup.less
index 647bb24c6..4b14dd7ef 100644
--- a/modules/system/assets/ui/less/popup.less
+++ b/modules/system/assets/ui/less/popup.less
@@ -64,7 +64,7 @@
     background: @color-popup-footer-bg;
     border: none;
     margin-top: 0;
-    padding: 0 20px 20px 20px;
+    padding: 0 @padding-standard @padding-standard @padding-standard;
 }
 
 .modal-body {
diff --git a/modules/system/assets/ui/less/scoreboard.less b/modules/system/assets/ui/less/scoreboard.less
index aa24e188d..c943a64b4 100644
--- a/modules/system/assets/ui/less/scoreboard.less
+++ b/modules/system/assets/ui/less/scoreboard.less
@@ -24,7 +24,7 @@ div.scoreboard {
     div.scoreboard-item {
         display: inline-block;
         margin-right: 40px;
-        margin-bottom: 20px;
+        margin-bottom: @padding-standard;
         vertical-align: top;
 
         &:last-child {
@@ -59,6 +59,6 @@ div.scoreboard {
 
 body.slim-container {
     div.scoreboard {
-        padding: 0 20px;
+        padding: 0 @padding-standard;
     }
 }
\ No newline at end of file
diff --git a/modules/system/assets/ui/less/select.less b/modules/system/assets/ui/less/select.less
index 583d428ac..258ec5f7a 100644
--- a/modules/system/assets/ui/less/select.less
+++ b/modules/system/assets/ui/less/select.less
@@ -223,6 +223,7 @@
         border-color: @input-border-focus;
         overflow-x: hidden;
         margin-top: -1px;
+        border-width: 2px;
         &--above {
             margin-top: 1px;
             .box-shadow(@select-box-shadow-above);
diff --git a/modules/system/assets/ui/less/select.mixins.less b/modules/system/assets/ui/less/select.mixins.less
index c635d6187..21ccba17f 100644
--- a/modules/system/assets/ui/less/select.mixins.less
+++ b/modules/system/assets/ui/less/select.mixins.less
@@ -4,7 +4,7 @@
 
 .select-input-defaults() {
     background-color: @input-bg;
-    border: 1px solid @input-border;
+    border: 2px solid @input-border;
     border-radius: @input-border-radius;
     color: @input-color;
     font-size: @input-font-size;
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index 66d6dc58d..cd4fef412 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -1563,7 +1563,7 @@ div.scoreboard.scroll-after:after{display:block}
 div.scoreboard:before,div.scoreboard:after{margin-top:-10px}
 div.scoreboard:before{left:7px}
 div.scoreboard:after{right:10px}
-div.scoreboard div.scoreboard-item{display:inline-block;margin-right:40px;margin-bottom:20px;vertical-align:top}
+div.scoreboard div.scoreboard-item{display:inline-block;margin-right:40px;margin-bottom:25px;vertical-align:top}
 div.scoreboard div.scoreboard-item:last-child{margin-right:0}
 div.scoreboard .control-chart{height:67px}
 div.scoreboard .control-chart ul{margin-left:77px;top:-2px}
@@ -1571,7 +1571,7 @@ div.scoreboard .control-chart ul li{padding-left:18px}
 div.scoreboard .control-chart ul li > i{margin-left:-18px}
 div.scoreboard .control-chart .canvas + ul{margin-left:0}
 div.scoreboard .scoreboard-offset{padding-left:20px}
-body.slim-container div.scoreboard{padding:0 20px}
+body.slim-container div.scoreboard{padding:0 25px}
 #layout-canvas .flash-message{display:none}
 .flash-message{position:fixed;width:500px;left:50%;top:13px;margin-left:-250px;color:#ffffff;font-size:13px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
 .flash-message.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:all 0.5s,width 0s;transition:all 0.5s,width 0s;-webkit-transform:scale(0.9);-ms-transform:scale(0.9);transform:scale(0.9)}
@@ -2075,10 +2075,10 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .select2-container .loading-indicator > span{background-image:url('images/loader-transparent.svg');left:auto;right:10px;top:19px;background-size:17px 17px}
 .select2-container.in-progress .select2-selection .select2-selection__arrow b{display:none !important}
 .select2-container--default{display:block; }
-.select2-container--default .select2-selection{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px;outline:0}
+.select2-container--default .select2-selection{background-color:#ffffff;border:2px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px;outline:0}
 .select2-container--default .select2-search--dropdown{position:relative}
 .select2-container--default .select2-search--dropdown:after{position:absolute;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f002";right:10px;top:7px;color:#95a5a6}
-.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px}
+.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:2px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px}
 .select2-container--default .select2-search__field{outline:0}
 .select2-container--default .select2-search__field::-webkit-input-placeholder{color:#cccccc}
 .select2-container--default .select2-search__field:-moz-placeholder{color:#cccccc}
@@ -2106,7 +2106,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .select2-container--default.select2-container--disabled .select2-selection,.select2-container--default.select2-container--disabled .select2-search__field{cursor:not-allowed}
 .select2-container--default.select2-container--disabled .select2-selection,.select2-container--default.select2-container--disabled .select2-selection--multiple .select2-selection__choice{background-color:#eeeeee}
 .select2-container--default.select2-container--disabled .select2-selection__clear,.select2-container--default.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove{display:none}
-.select2-container--default .select2-dropdown{-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.075);box-shadow:0 3px 6px rgba(0,0,0,0.075);border-color:#1f99dc;overflow-x:hidden;margin-top:-1px}
+.select2-container--default .select2-dropdown{-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.075);box-shadow:0 3px 6px rgba(0,0,0,0.075);border-color:#1f99dc;overflow-x:hidden;margin-top:-1px;border-width:2px}
 .select2-container--default .select2-dropdown--above{margin-top:1px;-webkit-box-shadow:0 -3px 6px rgba(0,0,0,0.075);box-shadow:0 -3px 6px rgba(0,0,0,0.075)}
 .select2-container--default .select2-results > .select2-results__options{font-size:15px;max-height:200px;overflow-y:auto}
 .select2-container--default .select2-selection--single{height:39px;line-height:1.42857143;padding:8px 25px 8px 13px}
@@ -2355,6 +2355,7 @@ table.table.data thead td.active,table.table.data thead th.active{background-col
 table.table.data thead td.active > span:after,table.table.data thead th.active > span:after,table.table.data thead td.active > a:after,table.table.data thead th.active > a:after{color:#c63e26;opacity:1 !important;filter:alpha(opacity=100) !important}
 table.table.data thead tr th:first-child{padding-left:10px}
 table.table.data thead tr th:last-child a{padding-right:25px}
+table.table.data thead .list-checkbox .custom-checkbox{top:-20px}
 table.table.data tbody tr:nth-child(even) td,table.table.data tbody tr:nth-child(even) th{background-color:#ecf0f1}
 table.table.data tbody td,table.table.data tbody th{padding:11px 15px;color:#666666;border-color:#e4e7e8;font-size:14px}
 table.table.data tbody td a:not(.btn),table.table.data tbody th a:not(.btn){color:#666666}
@@ -2390,9 +2391,9 @@ table.table.data tfoot td,table.table.data tfoot th{border-color:#d4d8da;padding
 table.table.data th.list-cell-type-switch,table.table.data td.list-cell-type-switch{text-align:center}
 table.table.data .list-checkbox{padding-left:16px;padding-right:8px;width:52px;vertical-align:top;border-right:1px solid #eeeeee}
 table.table.data .list-checkbox .checkbox{margin:0}
-table.table.data .list-checkbox .custom-checkbox{position:relative;top:5px;left:-2px}
-table.table.data .list-checkbox .custom-checkbox label{margin-right:0}
-table.table.data thead tr th.list-checkbox{padding:18px 0 0 20px}
+table.table.data .list-checkbox .custom-checkbox{position:relative;top:-14px;left:-2px}
+table.table.data .list-checkbox .custom-checkbox label{margin-right:0;margin-bottom:0}
+table.table.data thead tr th.list-checkbox{padding:18px 0 0 25px}
 table.table.data .list-tree{width:10px;padding:0}
 table.table.data .list-tree a.list-expand-collapse{padding:5px;display:block;text-align:center;font-size:14px;position:relative;top:5px;left:10px;text-decoration:none !important}
 table.table.data tr.list-tree-level-1 a.list-expand-collapse{left:30px}
@@ -2568,30 +2569,32 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
 .control-pagination .page-back{padding-right:6px}
 .control-pagination .page-next:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105"}
 .control-pagination .page-back:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f104"}
-.control-filter{padding:0 10px;font-size:13px;color:#949ea6;background-color:#f3f3f3;border-top:1px solid #949ea6;border-bottom:1px solid #949ea6}
+.control-filter{padding:0 10px;font-size:15px;color:#949ea6;background-color:#ecf0f1;border-top:1px solid #d7dbdd;border-bottom:1px solid #d7dbdd}
 .control-filter a{text-decoration:none;color:#949ea6}
 .control-filter > .filter-scope{display:inline-block;padding:15px}
-.control-filter > .filter-scope .filter-setting{display:inline-block;-webkit-transition:color 0.6s;transition:color 0.6s}
+.control-filter > .filter-scope .filter-label{margin-right:5px}
+.control-filter > .filter-scope .filter-setting{display:inline-block;margin-right:5px;-webkit-transition:color 0.6s;transition:color 0.6s}
 .control-filter > .filter-scope:after{font-size:14px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f107"}
-.control-filter > .filter-scope.active .filter-setting{padding-left:5px;padding-right:5px;color:#FFF;background-color:#cc3300;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-transition:color 1s,background-color 1s;transition:color 1s,background-color 1s}
+.control-filter > .filter-scope.active .filter-setting{padding-left:5px;padding-right:5px;color:#FFF;background-color:#6aab55;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-transition:color 1s,background-color 1s;transition:color 1s,background-color 1s}
 .control-filter > .filter-scope.checkbox{padding-left:35px}
 .control-filter > .filter-scope.checkbox,.control-filter > .filter-scope.checkbox label{margin-bottom:0}
+.control-filter > .filter-scope.checkbox label{padding-left:30px}
 .control-filter > .filter-scope.checkbox:after{content:''}
 .control-filter > .filter-scope:hover{color:#000}
 .control-filter > .filter-scope:hover .filter-label{color:#949ea6}
-.control-filter > .filter-scope:hover.active .filter-setting{background-color:#b32d00}
+.control-filter > .filter-scope:hover.active .filter-setting{background-color:#5f9a4c}
 .control-filter-popover{min-width:275px}
 .control-filter-popover .filter-search{min-height:36px}
-.control-filter-popover .filter-search input{min-height:36px;border:none;border-bottom:1px solid #949ea6;border-bottom-right-radius:0;border-bottom-left-radius:0;background-color:transparent}
+.control-filter-popover .filter-search input{min-height:36px;border:none;border-bottom:1px solid #d7dbdd;border-bottom-right-radius:0;border-bottom-left-radius:0;background-color:transparent}
 .control-filter-popover .filter-search .form-control.icon.search{background-position:right -81px}
 .control-filter-popover .filter-search .close{display:none}
-.control-filter-popover .filter-items,.control-filter-popover .filter-active-items{color:#949ea6;font-size:13px}
+.control-filter-popover .filter-items,.control-filter-popover .filter-active-items{color:#949ea6;font-size:14px}
 .control-filter-popover .filter-items ul,.control-filter-popover .filter-active-items ul,.control-filter-popover .filter-items li,.control-filter-popover .filter-active-items li{list-style-type:none;margin:0;padding:0}
 .control-filter-popover .filter-items li,.control-filter-popover .filter-active-items li{-webkit-transition:color 0.6s,background-color 0.3s;transition:color 0.6s,background-color 0.3s}
 .control-filter-popover .filter-items a,.control-filter-popover .filter-active-items a{text-decoration:none;color:#949ea6;display:block;padding:7px 15px}
 .control-filter-popover .filter-items a:before,.control-filter-popover .filter-active-items a:before{margin-right:8px;display:inline-block;vertical-align:baseline}
 .control-filter-popover .filter-items a:hover,.control-filter-popover .filter-active-items a:hover{background-color:#4da7e8;color:#FFFFFF}
-.control-filter-popover .filter-items{height:100px;overflow:auto;background-color:#fafafa;border-bottom:1px solid #949ea6}
+.control-filter-popover .filter-items{height:100px;overflow:auto;background-color:#fafafa;border-bottom:1px solid #d7dbdd}
 .control-filter-popover .filter-items a:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f067"}
 .control-filter-popover .filter-items li.loading{padding:7px}
 .control-filter-popover .filter-items li.loading > span{display:block;height:20px;width:20px;background-image:url('images/loader-transparent.svg');background-size:20px 20px;background-position:50% 50%;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}
@@ -2612,10 +2615,10 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
 .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000}
 .modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}
 .modal-backdrop.in{opacity:0.5;filter:alpha(opacity=50)}
-.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}
+.modal-header{padding:15px 25px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}
 .modal-header .close{margin-top:-2px}
 .modal-title{margin:0;line-height:1.42857143}
-.modal-body{position:relative;padding:20px}
+.modal-body{position:relative;padding:20px 25px}
 .modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}
 .modal-footer .btn + .btn{margin-left:5px;margin-bottom:0}
 .modal-footer .btn-group .btn + .btn{margin-left:-1px}
@@ -2630,7 +2633,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
 .modal-content .close{color:#fff}
 .modal-header{background:#d35400;color:#ecf0f1;border:none}
 .modal-header h4{font-weight:600;font-size:16px}
-.modal-footer{background:transparent;border:none;margin-top:0;padding:0 20px 20px 20px}
+.modal-footer{background:transparent;border:none;margin-top:0;padding:0 25px 25px 25px}
 .modal-body{padding-bottom:0}
 .modal-body > p:last-child{margin-bottom:20px}
 .modal-dialog.size-adaptive{width:100%;padding-right:50px;padding-left:50px}