diff --git a/gui/app/components/customize/user-groups.js b/gui/app/components/customize/user-groups.js
index fcf7107e..612ab8a6 100644
--- a/gui/app/components/customize/user-groups.js
+++ b/gui/app/components/customize/user-groups.js
@@ -24,7 +24,7 @@ export default Component.extend(AuthProvider, ModalMixin, {
 	searchText: '',
 	users: null,
 	members: null,
-	userLimit: 100,
+	userLimit: 25,
 
 	didReceiveAttrs() {
 		this._super(...arguments);
diff --git a/gui/app/components/customize/user-list.js b/gui/app/components/customize/user-list.js
index d19fb411..9f0cb8ac 100644
--- a/gui/app/components/customize/user-list.js
+++ b/gui/app/components/customize/user-list.js
@@ -25,6 +25,7 @@ export default Component.extend(AuthProvider, ModalMixin, Notifier, {
 	filter: '',
 	hasSelectedUsers: false,
 	showDeleteDialog: false,
+	showPermExplain: false,
 
 	init() {
 		this._super(...arguments);
@@ -58,6 +59,16 @@ export default Component.extend(AuthProvider, ModalMixin, Notifier, {
 	},
 
 	actions: {
+		togglePerms() {
+			this.set('showPermExplain', !this.get('showPermExplain'));
+
+			if (this.showPermExplain) {
+				this.$(".perms").show();
+			} else {
+				this.$(".perms").hide();
+			}
+		},
+
 		toggleSelect(user) {
 			user.set('selected', !user.get('selected'));
 
diff --git a/gui/app/components/ui/ui-toolbar-label.js b/gui/app/components/ui/ui-toolbar-label.js
index a940d019..165e5d6a 100644
--- a/gui/app/components/ui/ui-toolbar-label.js
+++ b/gui/app/components/ui/ui-toolbar-label.js
@@ -22,11 +22,14 @@ export default Component.extend({
 	color: '',
 	label: '',
 	tooltip: '',
+	selected: false,
 
-	calcClass: computed(function() {
+	calcClass: computed('selected', function() {
 		let c = '';
 		if (this.color !== '') c += this.color + ' ';
 
+		if (this.selected === true) c += 'label-selected';
+
 		return c.trim();
 	}),
 
diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js
index 03705691..2f6a86e1 100644
--- a/gui/app/constants/constants.js
+++ b/gui/app/constants/constants.js
@@ -202,6 +202,10 @@ let constants = EmberObject.extend({
 		ArrowDown: 'dicon-arrow-down-2',
 		ArrowLeft: 'dicon-arrow-left-2',
 		ArrowRight: 'dicon-arrow-right-2',
+		ArrowSmallUp: 'dicon-small-up',
+		ArrowSmallDown: 'dicon-small-down',
+		ArrowSmallLeft: 'dicon-small-left',
+		ArrowSmallRight: 'dicon-small-right',
 		Attachment: 'dicon-attachment',
 		BarChart: 'dicon-chart-bar-2',
 		Bookmark: 'dicon-bookmark',
diff --git a/gui/app/pods/customize/users/controller.js b/gui/app/pods/customize/users/controller.js
index 49377a87..f77cd34b 100644
--- a/gui/app/pods/customize/users/controller.js
+++ b/gui/app/pods/customize/users/controller.js
@@ -16,7 +16,7 @@ export default Controller.extend({
 	userService: service('user'),
 	globalSvc: service('global'),
 	syncInProgress: false,
-	userLimit: 100,
+	userLimit: 25,
 
 	loadUsers(filter) {
 		this.get('userService').getComplete(filter, this.get('userLimit')).then((users) => {
diff --git a/gui/app/styles/core/ui/ui-toolbar.scss b/gui/app/styles/core/ui/ui-toolbar.scss
index 5ee5b8ba..3b4a3dd5 100644
--- a/gui/app/styles/core/ui/ui-toolbar.scss
+++ b/gui/app/styles/core/ui/ui-toolbar.scss
@@ -4,7 +4,6 @@
 
 .dmz-toolbar {
 	display: inline-flex;
-	// flex: 0 1 auto;
 	flex-basis: auto;
     text-align: center;
     white-space: nowrap;
@@ -30,7 +29,6 @@
 	}
 
 	> .label {
-		// display: inline-block;
 		font-size: 14px;
 		font-weight: 500;
 		color: map-get($gray-shades, 600);
@@ -39,6 +37,10 @@
 		cursor: pointer;
 	}
 
+	> .label-selected {
+		color: map-get($yellow-shades, 600);
+	}
+
 	> .red {
 		color: map-get($red-shades, 500);
 
diff --git a/gui/app/styles/core/view/customize.scss b/gui/app/styles/core/view/customize.scss
index 09f1e3c1..3175e535 100644
--- a/gui/app/styles/core/view/customize.scss
+++ b/gui/app/styles/core/view/customize.scss
@@ -5,24 +5,35 @@
 		background-color: map-get($yellow-shades, 100);
 		border: 1px solid map-get($yellow-shades, 300);
 		@include border-radius(3px);
+		@extend .no-select;
 
 		> .title {
 			font-weight: 700;
 			font-size: 1.1rem;
 			color: map-get($yellow-shades, 800);
+			cursor: pointer;
+
+			> i {
+				font-size: 20px;
+				vertical-align: sub;
+			}
 		}
 
-		> .perm-name {
-			font-size: 1rem;
-			font-weight: 600;
-			color: map-get($gray-shades, 800);
-			margin-top: 10px;
-		}
+		.perms {
+			display: none;
 
-		> .perm-desc {
-			font-size: 0.9rem;
-			font-weight: 300;
-			color: map-get($gray-shades, 800);
+			> .perm-name {
+				font-size: 1rem;
+				font-weight: 600;
+				color: map-get($gray-shades, 800);
+				margin-top: 10px;
+			}
+
+			> .perm-desc {
+				font-size: 0.9rem;
+				font-weight: 300;
+				color: map-get($gray-shades, 800);
+			}
 		}
 	}
 
diff --git a/gui/app/templates/components/customize/user-groups.hbs b/gui/app/templates/components/customize/user-groups.hbs
index 48e1c131..2db4a10c 100644
--- a/gui/app/templates/components/customize/user-groups.hbs
+++ b/gui/app/templates/components/customize/user-groups.hbs
@@ -135,15 +135,15 @@
 					<div class="view-customize">
 						<div class="text-center">
 							{{#ui/ui-toolbar dark=false light=false raised=false large=true bordered=false tooltip="Maximum users to display"}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="1" onClick=(action "onLimit" 1)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="10" onClick=(action "onLimit" 10)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="25" onClick=(action "onLimit" 25)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="50" onClick=(action "onLimit" 50)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="100" onClick=(action "onLimit" 100)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="250" onClick=(action "onLimit" 250)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="500" onClick=(action "onLimit" 500)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="1,000" onClick=(action "onLimit" 1000)}}
-								{{ui/ui-toolbar-label color=constants.Color.Gray label="ALL" onClick=(action "onLimit" 99999)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="5" selected=(eq userLimit 5) onClick=(action "onLimit" 5)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="10" selected=(eq userLimit 10) onClick=(action "onLimit" 10)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="25" selected=(eq userLimit 25) onClick=(action "onLimit" 25)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="50" selected=(eq userLimit 50) onClick=(action "onLimit" 50)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="100" selected=(eq userLimit 100) onClick=(action "onLimit" 100)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="250" selected=(eq userLimit 250) onClick=(action "onLimit" 250)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="500" selected=(eq userLimit 500) onClick=(action "onLimit" 500)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="1,000" selected=(eq userLimit 1000) onClick=(action "onLimit" 1000)}}
+								{{ui/ui-toolbar-label color=constants.Color.Gray label="ALL" selected=(eq userLimit 99999) onClick=(action "onLimit" 99999)}}
 							{{/ui/ui-toolbar}}
 						</div>
 						{{ui/ui-spacer size=300}}
diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs
index a563b68d..f897493c 100644
--- a/gui/app/templates/components/customize/user-list.hbs
+++ b/gui/app/templates/components/customize/user-list.hbs
@@ -19,17 +19,26 @@
 
 	{{ui/ui-spacer size=300}}
 	<div class="explain-user-perms">
-		<div class="title">User Permissions Explained</div>
-		<div class="perm-name">Spaces</div>
-		<div class="perm-desc">Can add spaces, both personal and shared with others</div>
-		<div class="perm-name">Visible</div>
-		<div class="perm-desc">Can see names of users and groups, can disable for external users like customers/partners</div>
-		<div class="perm-name">Admin</div>
-		<div class="perm-desc">Can manage all aspects of Documize, like this screen</div>
-		<div class="perm-name">Analytics</div>
-		<div class="perm-desc">Can view analytical reports<</div>
-		<div class="perm-name">Active</div>
-		<div class="perm-desc">Can login and use Documize</div>
+		<div class="title" {{action "togglePerms"}}>
+			Permissions Explained
+			{{#if showPermExplain}}
+				<i class="dicon {{constants.Icon.ArrowSmallUp}}" />
+			{{else}}
+				<i class="dicon {{constants.Icon.ArrowSmallDown}}" />
+			{{/if}}
+		</div>
+		<div class="perms">
+			<div class="perm-name">Spaces</div>
+			<div class="perm-desc">Can add spaces, both personal and shared with others</div>
+			<div class="perm-name">Visible</div>
+			<div class="perm-desc">Can see names of users and groups, can disable for external users like customers/partners</div>
+			<div class="perm-name">Admin</div>
+			<div class="perm-desc">Can manage all aspects of Documize, like this screen</div>
+			<div class="perm-name">Analytics</div>
+			<div class="perm-desc">Can view analytical reports<</div>
+			<div class="perm-name">Active</div>
+			<div class="perm-desc">Can login and use Documize</div>
+		</div>
 	</div>
 	{{ui/ui-spacer size=300}}
 
@@ -40,15 +49,15 @@
 
 	<div class="text-center">
 		{{#ui/ui-toolbar dark=false light=false raised=false large=true bordered=false tooltip="Maximum users to display"}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="1" onClick=(action "onLimit" 1)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="10" onClick=(action "onLimit" 10)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="25" onClick=(action "onLimit" 25)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="50" onClick=(action "onLimit" 50)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="100" onClick=(action "onLimit" 100)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="250" onClick=(action "onLimit" 250)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="500" onClick=(action "onLimit" 500)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="1,000" onClick=(action "onLimit" 1000)}}
-			{{ui/ui-toolbar-label color=constants.Color.Gray label="ALL" onClick=(action "onLimit" 99999)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="5" selected=(eq userLimit 5) onClick=(action "onLimit" 5)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="10" selected=(eq userLimit 10) onClick=(action "onLimit" 10)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="25" selected=(eq userLimit 25) onClick=(action "onLimit" 25)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="50" selected=(eq userLimit 50) onClick=(action "onLimit" 50)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="100" selected=(eq userLimit 100) onClick=(action "onLimit" 100)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="250" selected=(eq userLimit 250) onClick=(action "onLimit" 250)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="500" selected=(eq userLimit 500) onClick=(action "onLimit" 500)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="1,000" selected=(eq userLimit 1000) onClick=(action "onLimit" 1000)}}
+			{{ui/ui-toolbar-label color=constants.Color.Gray label="ALL" selected=(eq userLimit 99999) onClick=(action "onLimit" 99999)}}
 		{{/ui/ui-toolbar}}
 	</div>