moving user filter for groups

app/assets/javascripts/discourse/templates/group-index.hbs

@@ -1,21 +1,25 @@
 <div class="group-members-actions">
+  {{#if hasMembers}}
     {{text-field value=filterInput
         placeholderKey=filterPlaceholder
         class="group-username-filter no-blur"}}
+  {{/if}}
 
+  <div class="group-members-add">
     {{#if canManageGroup}}
-    {{#if currentUser.admin}}
-      {{group-members-dropdown
-          showAddMembersModal="showAddMembersModal"
-          showBulkAddModal="showBulkAddModal"}}
-    {{else}}
       {{d-button icon="plus"
       action="showAddMembersModal"
       label="groups.add_members.title"
       class="group-members-add"}}
+      {{#if currentUser.admin}}
+        {{d-button icon="plus"
+        action="showBulkAddModal"
+        label="admin.groups.bulk_add.title"
+        class="group-bulk-add"}}
       {{/if}}
     {{/if}}
   </div>
+</div>
 
 {{#if hasMembers}}
   {{#load-more selector=".group-members tr" action="loadMore"}}

app/assets/stylesheets/common/base/group.scss

@@ -14,18 +14,19 @@
 }
 
 .group-members-actions {
-  position: absolute;
-  top: -49px;
-  right: 0px;
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+
+  input + .group-members-add {
+    margin-left: auto;
+  }
 
   .group-username-filter {
-    margin: 0px;
+    margin: 0 0 5px 0;
     vertical-align: middle;
   }
 
-  .group-members-dropdown, .group-members-add {
-    vertical-align: middle;
-  }
 }
 
 .group-info {