diff --git a/less/groups.less b/less/groups.less
index fff8b3d..6b15973 100644
--- a/less/groups.less
+++ b/less/groups.less
@@ -132,7 +132,7 @@
 		}
 	}
 
-	[component="groups/members"] {
+	[component="groups/members"], [component="groups/pending"] {
 		img {
 			width: 32px;
 		}
@@ -142,4 +142,16 @@
 		}
 	}
 
+	[component="groups/members"] {
+		tbody {
+			max-height: 500px;
+			display:block;
+			overflow-y: auto;
+			.member-name {
+				width: 100%;
+			}
+		}
+	}
+
+
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 026bdcf..434d221 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "0.1.69",
+  "version": "0.1.71",
   "nbbpm": {
     "compatibility": "^0.7.0"
   },
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 1245b3d..854e1d0 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -29,7 +29,8 @@
 				<h3 class="panel-title"><i class="fa fa-users"></i> [[groups:details.members]]</h3>
 			</div>
 			<div class="panel-body">
-				<table component="groups/members" class="table table-striped table-hover">
+				<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/><br/>
+				<table component="groups/members" class="table table-striped table-hover" data-nextstart="{group.membersNextStart}">
 					<!-- BEGIN members -->
 					<tr data-uid="{group.members.uid}">
 						<td>
@@ -84,7 +85,7 @@
 
 			</div>
 			<div class="panel-body">
-				<table component="groups/members" class="table table-striped table-hover">
+				<table component="groups/pending" class="table table-striped table-hover">
 					<!-- BEGIN pending -->
 					<tr data-uid="{group.pending.uid}">
 						<td>