3 files changed, 49 insertions, 4 deletions

diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 00fd838f0..53c52fdf1 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -236,7 +236,7 @@
         &.more-channel__modal {
             .modal-body {
                 overflow-x: hidden;
-                padding: 10px 0 20px;
+                padding: 10px 0 15px;
             }
 
             .channel-count {
@@ -457,12 +457,12 @@
 
         .modal-body {
             overflow-x: hidden;
-            padding: 10px 0 20px;
+            padding: 10px 0 15px;
         }
 
         .filter-row {
             @include clearfix;
-            margin: 10px 0;
+            margin: 5px 0 10px;
         }
 
         .member-count {
@@ -602,9 +602,16 @@
     }
 }
 
+.member-select__container {
+    position: absolute;
+    right: 15px;
+    top: 15px;
+}
+
 .filtered-user-list {
     display: flex;
     flex-direction: column;
+    width: 100%;
 
     .filter-row {
         flex-grow: 0;
@@ -615,4 +622,20 @@
         flex-grow: 1;
         flex-shrink: 1;
     }
+
+    .filter-controls {
+        @include clearfix;
+        flex-grow: 0;
+        flex-shrink: 0;
+        padding: 1em 1.5em 0;
+
+        .filter-control__next {
+            float: right;
+        }
+    }
+
+    .filter-button {
+        margin-left: 0;
+        padding-left: 0;
+    }
 }
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index 9a0190ebd..a3e7ab5f5 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -96,7 +96,13 @@
     }
 
     .member-select__container {
+        margin-bottom: 10px;
         margin-top: 10px;
+        overflow: hidden;
+        position: relative;
+        right: 10px;
+        top: 0;
+        width: 100%;
     }
 
     .user-popover {
@@ -844,6 +850,10 @@
             @include translate3d(0, 0, 0);
         }
 
+        .nav-pills__container {
+            height: 100%;
+        }
+
         > div {
             padding-bottom: 70px;
         }
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index cbed38a8b..83c68dc6b 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -239,6 +239,19 @@
         }
     }
 
+    .more-modal__list {
+        .filtered-user-list {
+             .filter-controls {
+                padding-bottom: 1em;
+             }
+        }
+
+        .filter-row {
+            margin: 10px 0;
+            overflow: hidden;
+        }
+    }
+
     .member-list-holder {
         background: $white;
         margin-bottom: 4em;
@@ -451,4 +464,3 @@
     overflow: hidden;
     text-overflow: ellipsis;
 }
-