diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index 14c08d2ea9..8b5856d3ab 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018 - 2020
+	Portions created by the Initial Developer are Copyright (C) 2018-2020
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -185,36 +185,43 @@
 	if (isset($sql_search)) {
 		$sql .= "where ".$sql_search;
 	}
-	$sql .= "order by application_name asc ";
+	$sql .= "order by application_name asc, permission_name asc ";
 	$database = new database;
-	$group_permissions = $database->select($sql, $parameters, 'all');
+	$application_permissions = $database->select($sql, $parameters, 'all');
+	if (is_array($application_permissions) && @sizeof($application_permissions) != 0) {
+		foreach ($application_permissions as $x => $row) {
+			$array[$row['application_uuid']]['name'] = $row['application_name'];
+			$array[$row['application_uuid']]['permissions'][$x]['uuid'] = $row['permission_uuid'];
+			$array[$row['application_uuid']]['permissions'][$x]['name'] = $row['permission_name'];
+			$array[$row['application_uuid']]['permissions'][$x]['description'] = $row['permission_description'];
+			$array[$row['application_uuid']]['permissions'][$x]['assigned'] = $row['permission_assigned'];
+		}
+		$application_permissions = $array;
+		unset($array);
+	}
 	unset($sql, $parameters);
-
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //include the header
+	$document['title'] = $text['title-group_permissions'];
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form id='form_list' method='post'>\n";
-	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
-	echo "<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
-	echo "<input type='hidden' id='action' name='action' value=''>\n";
-	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
-
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-group_permissions']." (".escape($group_name).")</b></div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'groups.php']);
-	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\">";
-	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=> null]);
-	if ($paging_controls_mini != '') {
-		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-sm-dn','link'=>'groups.php']);
+	echo 		"<form id='form_search' class='inline' method='get'>\n";
+	echo 		"<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','collapse'=>'hide-sm-dn','style'=>($search != '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','collapse'=>'hide-sm-dn','link'=>'group_permissions.php?group_uuid='.urlencode($group_uuid),'style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('group_permission_edit')) {
+		echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','collapse'=>'hide-sm-dn','style'=>'margin-left: 15px;','onclick'=>"document.getElementById('form_list').submit();"]);
 	}
-
-	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','name'=>'action','value'=>'save','style'=>'margin-left: 15px;']);
+	echo "		</form>\n";
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
@@ -222,66 +229,56 @@
 	echo $text['description-group_permissions']."\n";
 	echo "<br /><br />\n";
 
-	echo "<table class='list' border='0'>\n";
-	if (is_array($group_permissions) && @sizeof($group_permissions) != 0) {
-		$x = 0;
-		foreach ($group_permissions as $row) {
+	echo "<form id='form_list' method='post'>\n";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
+	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
-			$checked = ($row['permission_assigned'] === true) ? " checked=\"checked\"" : $checked = '';
+	if (is_array($application_permissions) && @sizeof($application_permissions) != 0) {
+		foreach ($application_permissions as $application_uuid => $application) {
 
-			$application_name = $row['application_name'];
-			$application_name = strtolower($application_name);
+			//output application heading
+				if (is_array($application['permissions']) && @sizeof($application['permissions']) != 0) {
 
-			$label_application_name = $row['application_name'];
-			$label_application_name = str_replace("_", " ", $label_application_name);
-			$label_application_name = str_replace("-", " ", $label_application_name);
-			$label_application_name = ucwords($label_application_name);
+					$application_name = strtolower($application['name']);
+					$label_application_name = ucwords(str_replace(['_','-'], ' ', $application['name']));
+
+					echo "<b>".escape($label_application_name)."</b><br />\n";
+
+					echo "<table class='list' style='margin: 10px 0 25px 0;'>\n";
+					echo "<tr class='list-header'>\n";
+					if (permission_exists('group_permission_edit')) {
+						echo "	<th class='checkbox'>\n";
+						echo "		<input type='checkbox' id='checkbox_all_".$application_name."' name='checkbox_all' onclick=\"list_all_toggle('".$application_name."');\">\n";
+						echo "	</th>\n";
+					}
+					echo "<th>".$text['label-group_name']."</th>\n";
+					echo "</tr>\n";
+
+					//output permissions
+						foreach ($application['permissions'] as $x => $permission) {
+							echo "<tr class='list-row'>\n";
+							if (permission_exists('group_permission_edit')) {
+								echo "	<td class='checkbox'>\n";
+								echo "		<input type='checkbox' name='group_permissions[$x][checked]' id='checkbox_".$x."' class='checkbox_".$application_name."' value='true' ".($permission['assigned'] === true ? "checked='checked'" : null)." onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$application_name."').checked = false; }\">\n";
+								echo "		<input type='hidden' name='group_permissions[$x][uuid]' value='".escape($permission['uuid'])."' />\n";
+								echo "		<input type='hidden' name='group_permissions[$x][permission]' value='".escape($permission['name'])."' />\n";
+								echo "	</td>\n";
+							}
+							echo "	<td class='no-wrap' onclick=\"if (document.getElementById('checkbox_".$x."').checked) { document.getElementById('checkbox_".$x."').checked = false; document.getElementById('checkbox_all_".$application_name."').checked = false; } else { document.getElementById('checkbox_".$x."').checked = true; }\">".escape($permission['name'])."</td>\n";
+							echo "</tr>\n";
+						}
+
+					echo "</table>\n";
 
-			if ($previous_application_name !== $row['application_name']) {
-				echo "		<tr>";
-				echo "			<td align='left' colspan='999'>&nbsp;</td>\n";
-				echo "		</tr>";
-				echo "		<tr>";
-				echo "			<td align='left' colspan='999' nowrap='nowrap'><b>".escape($label_application_name)."</b></td>\n";
-				echo "		</tr>";
-				echo "<tr class='list-header'>\n";
-				if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
-					echo "	<th class='checkbox'>\n";
-					echo "		<input type='checkbox' id='checkbox_all_".$application_name."' name='checkbox_all' onclick=\"list_all_toggle('".$application_name."');\">\n";
-					echo "	</th>\n";
 				}
-				echo th_order_by('group_name', $text['label-group_name'], $order_by, $order);
-				if (permission_exists('group_permission_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
-					echo "	<td class='action-button'>&nbsp;</td>\n";
-				}
-				echo "</tr>\n";
-
-			}
-			echo "<tr class='list-row'>\n";
-			if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
-				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='group_permissions[$x][checked]' id='checkbox_".$x."' class='checkbox_".$application_name."' value='true' ".$checked." onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$application_name."').checked = false; }\">\n";
-				echo "		<input type='hidden' name='group_permissions[$x][uuid]' value='".escape($row['permission_uuid'])."' />\n";
-				echo "		<input type='hidden' name='group_permissions[$x][permission]' value='".escape($row['permission_name'])."' />\n";
-				echo "	</td>\n";
-			}
-			echo "	<td>".escape($row['permission_name'])."</td>\n";
-			//echo "	<td>".escape($row['group_name'])."</td>\n";
-			echo "</tr>\n";
-
-			//set the previous category
-			$previous_application_name = $row['application_name'];
-			$x++;
 		}
-		unset($group_permissions);
+		unset($application_permissions);
 	}
 
-	echo "</table>\n";
-	echo "<br />\n";
-	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "</form>\n";
 
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file