diff --git a/core/groups/app_languages.php b/core/groups/app_languages.php
index 387654e1f3..8f0885cecc 100644
--- a/core/groups/app_languages.php
+++ b/core/groups/app_languages.php
@@ -1701,45 +1701,25 @@ $text['header-user_add']['ru-ru'] = "Пользователь";
 $text['header-user_add']['sv-se'] = "Användare";
 $text['header-user_add']['uk-ua'] = "Користувач";
 
-$text['header-group_permissions']['en-us'] = "Group Permissions: ";
-$text['header-group_permissions']['ar-eg'] = "";
-$text['header-group_permissions']['de-at'] = "Gruppenberechtigungen:"; //copied from de-de
-$text['header-group_permissions']['de-ch'] = "Gruppenberechtigungen:"; //copied from de-de
-$text['header-group_permissions']['de-de'] = "Gruppenberechtigungen:";
-$text['header-group_permissions']['es-cl'] = "Permisos de Grupo: ";
-$text['header-group_permissions']['es-mx'] = "Permisos de Grupo: "; //copied from es-cl
-$text['header-group_permissions']['fr-ca'] = "Permissions du Groupe: "; //copied from fr-fr
-$text['header-group_permissions']['fr-fr'] = "Permissions du Groupe: ";
-$text['header-group_permissions']['he-il'] = "הרשאות קבוצה";
-$text['header-group_permissions']['it-it'] = "Permessi Gruppo: ";
-$text['header-group_permissions']['nl-nl'] = "";
-$text['header-group_permissions']['pl-pl'] = "Uprawnienia grupy";
-$text['header-group_permissions']['pt-br'] = "Permissões do Grupo: "; //copied from pt-pt
-$text['header-group_permissions']['pt-pt'] = "Permissões do Grupo: ";
-$text['header-group_permissions']['ro-ro'] = "";
-$text['header-group_permissions']['ru-ru'] = "Права группы: ";
-$text['header-group_permissions']['sv-se'] = "Grupp Rättigheter";
-$text['header-group_permissions']['uk-ua'] = "Привілеї групи:";
-
-$text['header-group_members']['en-us'] = "Group Members: ";
+$text['header-group_members']['en-us'] = "Group Members ";
 $text['header-group_members']['ar-eg'] = "";
-$text['header-group_members']['de-at'] = "Gruppenmitglieder:"; //copied from de-de
-$text['header-group_members']['de-ch'] = "Gruppenmitglieder:"; //copied from de-de
-$text['header-group_members']['de-de'] = "Gruppenmitglieder:";
-$text['header-group_members']['es-cl'] = "Miembros de Grupo: ";
-$text['header-group_members']['es-mx'] = "Miembros de Grupo: "; //copied from es-cl
-$text['header-group_members']['fr-ca'] = "Membres du Groupe: "; //copied from fr-fr
-$text['header-group_members']['fr-fr'] = "Membres du Groupe: ";
+$text['header-group_members']['de-at'] = "Gruppenmitglieder"; //copied from de-de
+$text['header-group_members']['de-ch'] = "Gruppenmitglieder"; //copied from de-de
+$text['header-group_members']['de-de'] = "Gruppenmitglieder";
+$text['header-group_members']['es-cl'] = "Miembros de Grupo ";
+$text['header-group_members']['es-mx'] = "Miembros de Grupo "; //copied from es-cl
+$text['header-group_members']['fr-ca'] = "Membres du Groupe "; //copied from fr-fr
+$text['header-group_members']['fr-fr'] = "Membres du Groupe ";
 $text['header-group_members']['he-il'] = "משתמשי קבוצה";
 $text['header-group_members']['it-it'] = "Membri Gruppo: ";
 $text['header-group_members']['nl-nl'] = "";
-$text['header-group_members']['pl-pl'] = "Członkowie grupy:";
-$text['header-group_members']['pt-br'] = "Membros do Grupo: "; //copied from pt-pt
-$text['header-group_members']['pt-pt'] = "Membros do Grupo: ";
+$text['header-group_members']['pl-pl'] = "Członkowie grupy";
+$text['header-group_members']['pt-br'] = "Membros do Grupo "; //copied from pt-pt
+$text['header-group_members']['pt-pt'] = "Membros do Grupo ";
 $text['header-group_members']['ro-ro'] = "";
-$text['header-group_members']['ru-ru'] = "Участники группы: ";
-$text['header-group_members']['sv-se'] = "Grupp Medlemmar:";
-$text['header-group_members']['uk-ua'] = "Учасники групи: ";
+$text['header-group_members']['ru-ru'] = "Участники группы ";
+$text['header-group_members']['sv-se'] = "Grupp Medlemmar";
+$text['header-group_members']['uk-ua'] = "Учасники групи ";
 
 $text['header-group_manager']['en-us'] = "Group Manager";
 $text['header-group_manager']['ar-eg'] = "";
@@ -2221,6 +2201,46 @@ $text['button-users']['ru-ru'] = "Пользователи";
 $text['button-users']['sv-se'] = "Användare";
 $text['button-users']['uk-ua'] = "Користувачі";
 
+$text['button-members']['en-us'] = "Members";
+$text['button-members']['ar-eg'] = "";
+$text['button-members']['de-at'] = "Teilnehmer"; //copied from de-de
+$text['button-members']['de-ch'] = "Teilnehmer"; //copied from de-de
+$text['button-members']['de-de'] = "Teilnehmer";
+$text['button-members']['es-cl'] = "Miembros";
+$text['button-members']['es-mx'] = "Miembros"; //copied from es-cl
+$text['button-members']['fr-ca'] = "Membres"; //copied from fr-fr
+$text['button-members']['fr-fr'] = "Membres";
+$text['button-members']['he-il'] = "";
+$text['button-members']['it-it'] = "Membri";
+$text['button-members']['nl-nl'] = "Deelnemers";
+$text['button-members']['pl-pl'] = "Uczestnicy";
+$text['button-members']['pt-br'] = "Total";
+$text['button-members']['pt-pt'] = "Deputados";
+$text['button-members']['ro-ro'] = "";
+$text['button-members']['ru-ru'] = "Участники";
+$text['button-members']['sv-se'] = "Deltagare";
+$text['button-members']['uk-ua'] = "Учасники";
+
+$text['button-permissions']['en-us'] = "Permissions";
+$text['button-permissions']['ar-eg'] = "";
+$text['button-permissions']['de-at'] = "Berechtigungen"; //copied from de-de
+$text['button-permissions']['de-ch'] = "Berechtigungen"; //copied from de-de
+$text['button-permissions']['de-de'] = "Berechtigungen";
+$text['button-permissions']['es-cl'] = "Permisos";
+$text['button-permissions']['es-mx'] = "Permisos"; //copied from es-cl
+$text['button-permissions']['fr-ca'] = "Permissions"; //copied from fr-fr
+$text['button-permissions']['fr-fr'] = "Permissions";
+$text['button-permissions']['he-il'] = "הרשאות";
+$text['button-permissions']['it-it'] = "Permessi";
+$text['button-permissions']['nl-nl'] = "";
+$text['button-permissions']['pl-pl'] = "Uprawnienia";
+$text['button-permissions']['pt-br'] = "Permissões"; //copied from pt-pt
+$text['button-permissions']['pt-pt'] = "Permissões";
+$text['button-permissions']['ro-ro'] = "";
+$text['button-permissions']['ru-ru'] = "Права";
+$text['button-permissions']['sv-se'] = "Rättigheter";
+$text['button-permissions']['uk-ua'] = "Привілеї";
+
 $text['button-restore_default']['en-us'] = "Restore Default";
 $text['button-restore_default']['ar-eg'] = "";
 $text['button-restore_default']['de-at'] = "Zurücksetzen"; //copied from de-de
diff --git a/core/groups/group_edit.php b/core/groups/group_edit.php
index ec43968508..aaeabdd746 100644
--- a/core/groups/group_edit.php
+++ b/core/groups/group_edit.php
@@ -187,6 +187,15 @@
 	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']);
 	$button_margin = 'margin-left: 15px;';
+	if (permission_exists('group_permission_view')) {
+		echo button::create(['type'=>'button','label'=>$text['button-permissions'],'icon'=>'key','style'=>$button_margin,'link'=>'group_permissions.php?group_uuid='.urlencode($group_uuid)]);
+		unset($button_margin);
+	}
+	if (permission_exists('group_member_view')) {
+		echo button::create(['type'=>'button','label'=>$text['button-members'],'icon'=>'users','style'=>$button_margin,'link'=>'groupmembers.php?group_uuid='.urlencode($group_uuid)]);
+		unset($button_margin);
+	}
+	$button_margin = 'margin-left: 15px;';
 	if ($action == 'update' && permission_exists('group_add')) {
 		echo button::create(['type'=>'submit','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'action','value'=>'copy','style'=>$button_margin,'onclick'=>"if (confirm('".$text['confirm-copy']."')) { document.getElementById('frm').submit(); } else { this.blur(); return false; }"]);
 		unset($button_margin);
diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index b8f0f6d9d6..ebedba91c0 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -213,6 +213,9 @@
 	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','collapse'=>'hide-sm-dn','link'=>'groups.php']);
+	if (permission_exists('group_member_view')) {
+		echo button::create(['type'=>'button','label'=>$text['button-members'],'icon'=>'users','style'=>'margin-left: 15px;','link'=>'groupmembers.php?group_uuid='.urlencode($group_uuid)]);
+	}
 	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();'>";
diff --git a/core/groups/groupmembers.php b/core/groups/groupmembers.php
index 725ac1752d..d20bc7ce91 100644
--- a/core/groups/groupmembers.php
+++ b/core/groups/groupmembers.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) 2008-2012
+	Portions created by the Initial Developer are Copyright (C) 2008-2020
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -25,12 +25,12 @@
 */
 
 //includes
-	include "root.php";
+	require_once "root.php";
 	require_once "resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions
-	if (permission_exists('group_members_view') || if_group("superadmin")) {
+	if (permission_exists('group_member_view') || if_group("superadmin")) {
 		//access allowed
 	}
 	else {
@@ -143,11 +143,11 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<div class='heading'><b>".$text['header-group_members']." <i>".$group_name."</i> (".$num_rows.")</b></div>\n";
+	echo "	<div class='heading'><b>".$text['header-group_members']." (".$group_name.": ".$num_rows.")</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','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'groups.php']);
-	if (permission_exists('group_member_delete') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','collapse'=>'hide-xs','style'=>'margin-right: 15px;','onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
+	if (permission_exists('group_permission_view')) {
+		echo button::create(['type'=>'button','label'=>$text['button-permissions'],'icon'=>'key','style'=>'margin-right: 15px;','link'=>'group_permissions.php?group_uuid='.urlencode($group_uuid)]);
 	}
 	if (permission_exists('group_member_add')) {
 		echo 	"<form class='inline' method='post' action='groupmemberadd.php'>\n";
@@ -165,7 +165,10 @@
 		echo 	"<input type='hidden' name='group_name' value='".escape($group_name)."'>";
 		echo 	"<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>";
 		echo button::create(['type'=>'submit','label'=>$text['button-add_member'],'icon'=>$_SESSION['theme']['button_icon_add'],'collapse'=>'hide-xs']);
-		echo "	</form>\n";
+		echo "	</form>";
+	}
+	if (permission_exists('group_member_delete') && $result) {
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','collapse'=>'hide-xs','onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 	}
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";