diff --git a/_build/templates/default/sass/index.scss b/_build/templates/default/sass/index.scss
index 276defb3d44..92b6c7ba29d 100644
--- a/_build/templates/default/sass/index.scss
+++ b/_build/templates/default/sass/index.scss
@@ -1795,7 +1795,7 @@ iframe[classname="x-hidden"] {
       word-break: break-word;
     }
   }
-  @include grid-media($gtTabletP) {
+  @include grid-media($gtMobile) {
     ul {
       columns: 2;
       column-gap: 2rem;
@@ -1803,18 +1803,12 @@ iframe[classname="x-hidden"] {
   }
   .x-window & {
     margin-top: 1rem;
-    .header {
-      // padding-left: .5rem;
-      // display: inline-block;
-      // text-align: center;
-    }
   }
   .x-grid3 & {
     ul {
       position: relative;
       padding-left: 1rem;
       background-color: #fcfbfb;
-      columns: 5;
       .x-grid3-row-alt & {
         background-color: #f9faff;
       }
@@ -1838,7 +1832,23 @@ iframe[classname="x-hidden"] {
         font-style: italic;
       }
     }
+    @include grid-media($gtTabletP) {
+      ul {
+        columns: 3;
+      }
+    }
+    @include grid-media($gtTabletL) {
+      ul {
+        columns: 4;
+      }
+    }
+    @include grid-media($gtCinema) {
+      ul {
+        columns: 5;
+      }
+    }
   }
+
 }
 
 /* for selectability in ext grids */
diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.category.js b/manager/assets/modext/widgets/security/modx.grid.user.group.category.js
index b63a84ac264..d214a74be2d 100644
--- a/manager/assets/modext/widgets/security/modx.grid.user.group.category.js
+++ b/manager/assets/modext/widgets/security/modx.grid.user.group.category.js
@@ -1,6 +1,6 @@
 /**
  * @class MODx.grid.UserGroupCategory
- * @extends MODx.grid.Grid
+ * @extends MODx.grid.UserGroupBase
  * @param {Object} config An object of configuration properties
  * @xtype modx-grid-user-group-categories
  */
@@ -127,7 +127,7 @@ MODx.grid.UserGroupCategory = function UserGroupCategory(config = {}) {
                         scope: this
                     },
                     mouseout: {
-                        fn: function(evt) {
+                        fn: function() {
                             this.removeClass('x-btn-focus');
                         }
                     }
@@ -143,8 +143,8 @@ Ext.reg('modx-grid-user-group-category', MODx.grid.UserGroupCategory);
 
 /**
  * @class MODx.window.CreateUGCat
- * @extends MODx.Window
- * @param {Object} config An object of options.
+ * @extends MODx.window.UserGroupAclBase
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-category-create
  */
 MODx.window.CreateUGCat = function CreateUGCat(config = {}) {
@@ -181,7 +181,7 @@ Ext.reg('modx-window-user-group-category-create', MODx.window.CreateUGCat);
 /**
  * @class MODx.window.UpdateUGCat
  * @extends MODx.window.CreateUGCat
- * @param {Object} config An object of options.
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-category-update
  */
 MODx.window.UpdateUGCat = function UpdateUGCat(config = {}) {
diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.context.js b/manager/assets/modext/widgets/security/modx.grid.user.group.context.js
index d22413074bb..ddcb9d01f35 100644
--- a/manager/assets/modext/widgets/security/modx.grid.user.group.context.js
+++ b/manager/assets/modext/widgets/security/modx.grid.user.group.context.js
@@ -1,7 +1,6 @@
-/* eslint-disable no-console */
 /**
  * @class MODx.grid.UserGroupContext
- * @extends MODx.grid.Grid
+ * @extends MODx.grid.UserGroupBase
  * @param {Object} config An object of configuration properties
  * @xtype modx-grid-user-group-contexts
  */
@@ -122,7 +121,7 @@ MODx.grid.UserGroupContext = function UserGroupContext(config = {}) {
                         scope: this
                     },
                     mouseout: {
-                        fn: function(evt) {
+                        fn: function() {
                             this.removeClass('x-btn-focus');
                         }
                     }
@@ -138,8 +137,8 @@ Ext.reg('modx-grid-user-group-context', MODx.grid.UserGroupContext);
 
 /**
  * @class MODx.window.CreateUGAccessContext
- * @extends MODx.Window
- * @param {Object} config An object of options.
+ * @extends MODx.window.UserGroupAclBase
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-context-create
  */
 MODx.window.CreateUGAccessContext = function CreateUGAccessContext(config = {}) {
@@ -160,7 +159,7 @@ Ext.reg('modx-window-user-group-context-create', MODx.window.CreateUGAccessConte
 /**
  * @class MODx.window.UpdateUGAccessContext
  * @extends MODx.window.CreateUGAccessContext
- * @param {Object} config An object of options.
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-context-update
  */
 MODx.window.UpdateUGAccessContext = function UpdateUGAccessContext(config = {}) {
diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js b/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js
index 187ff0e7829..cfee9a635ea 100644
--- a/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js
+++ b/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js
@@ -81,9 +81,9 @@ MODx.grid.UserGroupNamespace = function UserGroupNamespace(config = {}) {
                         fn: function(cmp, record, selectedIndex) {
                             this.updateDependentFilter('filter-policy-namespace', 'namespace', record.data.name);
                             /*
-                                There's an odd conflict in the processor when using 'namespace' as the
-                                query param, therefor the alternate param 'ns' is used this listener, its component value, and in the value of
-                                this grid's main baseParams config
+                                There's an odd conflict in the processor when using 'namespace' as the query param,
+                                therefor the alternate param 'ns' is used this listener, its component value,
+                                and in the value of this grid's main baseParams config
                             */
                             this.applyGridFilter(cmp, 'ns');
                         },
@@ -126,7 +126,7 @@ MODx.grid.UserGroupNamespace = function UserGroupNamespace(config = {}) {
                         scope: this
                     },
                     mouseout: {
-                        fn: function(evt) {
+                        fn: function() {
                             this.removeClass('x-btn-focus');
                         }
                     }
@@ -143,7 +143,7 @@ Ext.reg('modx-grid-user-group-namespace', MODx.grid.UserGroupNamespace);
 /**
  * @class MODx.window.CreateUGNamespace
  * @extends MODx.window.UserGroupAclBase
- * @param {Object} config An object of options.
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-namespace-create
  */
 MODx.window.CreateUGNamespace = function CreateUGNamespace(config = {}) {
@@ -187,7 +187,7 @@ Ext.reg('modx-window-user-group-namespace-create', MODx.window.CreateUGNamespace
 /**
  * @class MODx.window.UpdateUGNamespace
  * @extends MODx.window.CreateUGNamespace
- * @param {Object} config An object of options.
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-namespace-update
  */
 MODx.window.UpdateUGNamespace = function UpdateUGNamespace(config = {}) {
diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js b/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js
index 935cd247cc4..21d294deb70 100644
--- a/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js
+++ b/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js
@@ -1,6 +1,6 @@
 /**
  * @class MODx.grid.UserGroupResourceGroup
- * @extends MODx.grid.Grid
+ * @extends MODx.grid.UserGroupBase
  * @param {Object} config An object of configuration properties
  * @xtype modx-grid-user-group-resource-groups
  */
@@ -129,7 +129,7 @@ MODx.grid.UserGroupResourceGroup = function UserGroupResourceGroup(config = {})
                         scope: this
                     },
                     mouseout: {
-                        fn: function(evt) {
+                        fn: function() {
                             this.removeClass('x-btn-focus');
                         }
                     }
@@ -145,7 +145,7 @@ Ext.reg('modx-grid-user-group-resource-group', MODx.grid.UserGroupResourceGroup)
 
 /**
  * @class MODx.window.CreateUGRG
- * @extends MODx.Window
+ * @extends MODx.window.UserGroupAclBase
  * @param {Object} config An object of options.
  * @xtype modx-window-user-group-resourcegroup-create
  */
diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.source.js b/manager/assets/modext/widgets/security/modx.grid.user.group.source.js
index 86d52a411fd..b8b978d3a7c 100644
--- a/manager/assets/modext/widgets/security/modx.grid.user.group.source.js
+++ b/manager/assets/modext/widgets/security/modx.grid.user.group.source.js
@@ -1,6 +1,6 @@
 /**
  * @class MODx.grid.UserGroupSource
- * @extends MODx.grid.Grid
+ * @extends MODx.grid.UserGroupBase
  * @param {Object} config An object of configuration properties
  * @xtype modx-grid-user-group-sources
  */
@@ -138,8 +138,8 @@ Ext.reg('modx-grid-user-group-source', MODx.grid.UserGroupSource);
 
 /**
  * @class MODx.window.CreateUGSource
- * @extends MODx.Window
- * @param {Object} config An object of options.
+ * @extends MODx.window.UserGroupAclBase
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-source-create
  */
 MODx.window.CreateUGSource = function CreateUGSource(config = {}) {
@@ -183,7 +183,7 @@ Ext.reg('modx-window-user-group-source-create', MODx.window.CreateUGSource);
 /**
  * @class MODx.window.UpdateUGSource
  * @extends MODx.window.CreateUGSource
- * @param {Object} config An object of options.
+ * @param {Object} config An object of options
  * @xtype modx-window-user-group-source-update
  */
 MODx.window.UpdateUGSource = function UpdateUGSource(config = {}) {