diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 57c9b0a53..6e3921781 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -6,6 +6,7 @@
 & {
     // Share modal
     .msg.cp-inline-radio-group {
+        overflow: unset !important;
         .radio-group {
             display: flex;
             flex-direction: row;
diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index 38202de86..4ff807638 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -12,6 +12,12 @@
             flex-wrap: wrap;
             margin-bottom: 6px;
         }
+        &:not(.large) {
+            .cp-usergrid-grid {
+                margin: -3px;
+                margin-bottom: 6px;
+            }
+        }
         &.cp-usergrid-empty {
             .cp-usergrid-grid, .cp-usergrid-filter {
                 display: none;
@@ -42,17 +48,12 @@
             justify-content: center;
             align-items: center;
             padding: 5px;
-            margin-bottom: 6px;
-            margin-right: 6px;
+            margin: 3px;
             cursor: default;
             transition: order 0.5s, background-color 0.5s;
             margin-top: 1px;
             .tools_unselectable();
 
-            &:nth-child(6n) {
-                margin-right: 0;
-            }
-
             &.cp-selected {
                 background-color: @colortheme_alertify-primary;
                 color: @colortheme_alertify-primary-text;
@@ -79,6 +80,7 @@
                 width: 140px;
                 height: 35px;
                 flex-flow: row;
+                margin: 0;
                 margin-right: 15px;
                 margin-bottom: 1px;
                 &:nth-child(3n) {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index e8a30c63d..f7c84298a 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -788,8 +788,8 @@ define([
             placeholder: Messages.share_filterFriend
         });
 
-        var div = h('div.cp-usergrid-container' + noOthers, [
-            h('label', label),
+        var div = h('div.cp-usergrid-container' + noOthers + (config.large?'.large':''), [
+            label ? h('label', label) : undefined,
             h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [
                 inputFilter,
                 buttonSelect,