diff --git a/.gitignore b/.gitignore
index 9b9db1ba0..0ba0d4da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@
 /system/tests/composer.lock
 /system/tests/support/_generated
 system/system
-system/templates/base/package-lock.json
diff --git a/system/classes/html/form/Banner.php b/system/classes/html/form/Banner.php
index 18f7c6178..5c28a692c 100644
--- a/system/classes/html/form/Banner.php
+++ b/system/classes/html/form/Banner.php
@@ -15,12 +15,10 @@ class Banner extends \Html\Form\FormElement
 
     use \Html\GlobalAttributes, \Html\Events;
 
-    public $form;
     public $name;
-    public $required;
     public $value;
 
-    static $_excludeFromOutput = ["value", "label"];
+    static $_excludeFromOutput = ["value"];
 
     /**
     * Returns built string of Banner field
@@ -40,50 +38,19 @@ public function __toString()
         return $buffer . '>' . $this->value . '</div>';
     }
 
-    /**
-     * The form element that the Banner is associated with (its
-     * "form owner"). The value of the attribute must be the ID of a form
-     * element in the same document. If this attribute is not specified, the
-     * <textarea> element must be a descendant of a form element. This attribute
-     * enables you to place <textarea> elements anywhere within a document, not
-     * just as descendants of their form elements.
-     *
-     * @param string $form
-     * @return \Html\Form\Banner
-     */
-    public function setForm($form)
-    {
-        $this->form = $form;
-
-        return $this;
-    }
-
     /**
      * The name of the control.
      *
      * @param string $name
      * @return \Html\Form\Banner
      */
-    public function setname($name)
+    public function setName($name)
     {
         $this->name = $name;
 
         return $this;
     }
 
-    /**
-     * This attribute is required by HtmlBootstrap5::multiColForm(...)
-     *
-     * @param string $required
-     * @return \Html\Form\Banner
-     */
-    public function setRequired($required)
-    {
-        $this->required = $required;
-
-        return $this;
-    }
-
     /**
      * The raw value contained in the control.
      *
diff --git a/system/modules/admin/actions/groups.php b/system/modules/admin/actions/groups.php
index c1320224a..e1e2a68f3 100755
--- a/system/modules/admin/actions/groups.php
+++ b/system/modules/admin/actions/groups.php
@@ -1,66 +1,51 @@
 <?php
+
 /**
-* Display a list of all groups which are not deleted
-*
-* @param <type> $w
-*/
+ * Display a list of all groups which are not deleted
+ *
+ * @param <type> $w
+ */
 function groups_GET(Web &$w)
 {
-	AdminService::getInstance($w)->navigation($w,"Groups");
+    AdminService::getInstance($w)->navigation($w, "Groups");
 
-	$table = array(array("Title", "Parent Groups", "Operations", "sort_key" => null));
+    $table = [["Title", "Parent Groups", "Operations", "sort_key" => null]];
 
-	$groups = AuthService::getInstance($w)->getGroups();
+    $groups = AuthService::getInstance($w)->getGroups();
 
-	if ($groups)
-	{
-		foreach ($groups as $group)
-		{
-			$ancestors = array();
-			 
-			$line = array();
+    if ($groups) {
+        usort($groups, function ($a, $b) {
+            return strcasecmp($a->login, $b->login);
+        });
 
-			$line[] = AuthService::getInstance($w)->user()->is_admin ? Html::box($w->localUrl("/admin/groupedit/".$group->id),"<u>".$group->login."</u>") : $group->login;
-			//if it is a sub group from other group;
-			$groupUsers = $group->isInGroups();
+        foreach ($groups as $group) {
+            $ancestors = [];
 
-			if ($groupUsers)
-			{
-				foreach ($groupUsers as $groupUser)
-				{
-					$ancestors[] = $groupUser->getGroup()->login;
-				}
-			}
-			$line[] = count($ancestors) > 0 ? "<div style=\"color:green;\">".implode(", ", $ancestors)."</div>" : "";
+            $line = [AuthService::getInstance($w)->user()->is_admin ? Html::box($w->localUrl("/admin/groupedit/" . $group->id), "<u>" . $group->login . "</u>") : $group->login];
+            //if it is a sub group from other group;
+            $groupUsers = $group->isInGroups();
 
-			$operations = Html::b("/admin/moreInfo/".$group->id,"Edit");
-			 
-			if (AuthService::getInstance($w)->user()->is_admin)
-			$operations .= Html::b("/admin/groupdelete/".$group->id,"Delete","Are you sure you want to delete this group?");
+            if ($groupUsers) {
+                foreach ($groupUsers as $groupUser) {
+                    $ancestors[] = $groupUser->getGroup()->login;
+                }
+            }
+            $line[] = count($ancestors) > 0 ? "<div class='text-success'>" . implode(", ", $ancestors) . "</div>" : "";
 
-			$line[] = $operations;
+            $operations = Html::b("/admin/moreInfo/" . $group->id, "Edit");
 
-			$line["sort_key"] = strtoupper($group->login);
-			 
-			$table[] = $line;
-		}
-	}
+            if (AuthService::getInstance($w)->user()->is_admin) {
+                $operations .= Html::b("/admin/groupdelete/" . $group->id, "Delete", "Are you sure you want to delete this group?");
+            }
 
-	if (AuthService::getInstance($w)->user()->is_admin)
-	{
-		$w->out(Html::box("/admin/groupadd", "New Group", true));
-	}
+            $line[] = $operations;
+            $table[] = $line;
+        }
+    }
 
-	// Order by sort key (group name in uppercase)
-	array_multisort(
-		array_column($table, "sort_key"),
-		SORT_ASC,
-		$table
-	);
-	// Remove sort column
-	for ($i = 0, $length = count($table); $i < $length; ++$i) {
-		unset($table[$i]["sort_key"]);
-	}
+    if (AuthService::getInstance($w)->user()->is_admin) {
+        $w->out(Html::box("/admin/groupadd", "New Group", true));
+    }
 
-	$w->out(Html::table($table,null,"tablesorter",true));
+    $w->out(Html::table($table, null, "tablesorter", true));
 }
diff --git a/system/modules/admin/actions/moreInfo.php b/system/modules/admin/actions/moreInfo.php
index 77d7fe9e8..85807c765 100755
--- a/system/modules/admin/actions/moreInfo.php
+++ b/system/modules/admin/actions/moreInfo.php
@@ -1,61 +1,51 @@
 <?php
+
 /**
-* Display member and permission infomation
-*
-* @param <type> $w
-*/
+ * Display member and permission infomation
+ *
+ * @param <type> $w
+ */
 function moreInfo_GET(Web &$w)
 {
-	$option = $w->pathMatch("group_id");
-
-	AdminService::getInstance($w)->navigation($w, AuthService::getInstance($w)->getUser($option['group_id'])->login);
-
-	if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner")
-	{
-		$w->ctx("addMember", Html::box("/admin/groupmember/".$option['group_id'],"New Member",true));
-	}
-	$w->ctx("editPermission", Html::b("/admin/permissionedit/".$option['group_id'],"Edit Permissions"));
-
-	//fill in member table;
-	$table = array(array("Name","Role","Operations", "sort_key" => null));
-
-	$groupMembers = AuthService::getInstance($w)->getGroupMembers($option['group_id']);
-		
-	if ($groupMembers)
-	{
-		foreach ($groupMembers as $groupMember)
-		{
-			$line = array();
-				
-			$style = $groupMember->role == "owner" ? "<div style=\"color:red;\">" : "<div style=\"color:blue;\">";
-				
-			$name = $groupMember->getUser()->is_group == 1 ? $groupMember->getUser()->login : $groupMember->getUser()->getContact()->getFullName();
-				
-			$line[] = $style.$name."</div>";
-			$line[] = $style.$groupMember->role."</div>";
-				
-			if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner")
-			{
-				$line[] = Html::a("/admin/memberdelete/".$option['group_id']."/".$groupMember->id,"Delete",null,null,"Are you sure you want to delete this member?");
-			}
-			else
-			{
-				$line[] = null;
-			}
-			$line["sort_key"] = strtoupper($name);
-			$table[] = $line;
-		}
-	}
-	// Order by sort key (name/group in uppercase)
-	array_multisort(
-		array_column($table, "sort_key"),
-		SORT_ASC,
-		$table
-	);
-	// Remove sort column
-	for ($i = 0, $length = count($table); $i < $length; ++$i) {
-		unset($table[$i]["sort_key"]);
-	}
-
-	$w->ctx("memberList", Html::table($table,null,"tablesorter",true));
+    $option = $w->pathMatch("group_id");
+
+    AdminService::getInstance($w)->navigation($w, AuthService::getInstance($w)->getUser($option['group_id'])->login);
+
+    if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner") {
+        $w->ctx("addMember", Html::box("/admin/groupmember/" . $option['group_id'], "New Member", true));
+    }
+    $w->ctx("editPermission", Html::b("/admin/permissionedit/" . $option['group_id'], "Edit Permissions"));
+
+    //fill in member table;
+    $table = array(array("Name", "Role", "Operations", "sort_key" => null));
+
+    $groupMembers = AuthService::getInstance($w)->getGroupMembers($option['group_id']);
+
+    if ($groupMembers) {
+        usort($groupMembers, function ($a, $b) {
+            $user_a = $a->getUser();
+            $user_b = $b->getUser();
+            $compare_a = $user_a->is_group == 1 ? $user_a->login : $user_a->getContact()->getFullName();
+            $compare_b = $user_b->is_group == 1 ? $user_b->login : $user_b->getContact()->getFullName();
+            return strcasecmp($compare_a, $compare_b);
+        });
+
+        foreach ($groupMembers as $groupMember) {
+            $line = [];
+
+            $style = $groupMember->role == "owner" ? "<div class='text-primary'>" : "<div>";
+
+            $line[] = $style . $groupMember->getUser()->is_group == 1 ? $groupMember->getUser()->login : $groupMember->getUser()->getContact()->getFullName() . "</div>";
+            $line[] = $style . $groupMember->role . "</div>";
+
+            if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner") {
+                $line[] = Html::a("/admin/memberdelete/" . $option['group_id'] . "/" . $groupMember->id, "Delete", null, null, "Are you sure you want to delete this member?");
+            } else {
+                $line[] = null;
+            }
+            $table[] = $line;
+        }
+    }
+
+    $w->ctx("memberList", Html::table($table, null, "tablesorter", true));
 }
diff --git a/system/modules/auth/models/AuthService.php b/system/modules/auth/models/AuthService.php
index d9d74df0d..9436a395b 100755
--- a/system/modules/auth/models/AuthService.php
+++ b/system/modules/auth/models/AuthService.php
@@ -504,14 +504,7 @@ public function getUsersForRole($role)
 
     public function getGroups()
     {
-        $rows = $this->_db->get("user")->where(['is_active' => 1, 'is_deleted' => 0, 'is_group' => 1])->fetchAll();
-
-        if ($rows) {
-            $objects = $this->fillObjects("User", $rows);
-
-            return $objects;
-        }
-        return null;
+        return $this->getObjects("User", ['is_active' => 1, 'is_deleted' => 0, 'is_group' => 1]);
     }
 
     public function getGroupMembers($group_id = null, $user_id = null)
@@ -524,22 +517,12 @@ public function getGroupMembers($group_id = null, $user_id = null)
             $option['user_id'] = $user_id;
         }
 
-        $groupMembers = $this->getObjects("GroupUser", $option, true);
-
-        if ($groupMembers) {
-            return $groupMembers;
-        }
-        return null;
+        return $this->getObjects("GroupUser", $option, true);
     }
 
     public function getGroupMemberById($id)
     {
-        $groupMember = $this->getObject("GroupUser", $id);
-
-        if ($groupMember) {
-            return $groupMember;
-        }
-        return null;
+        return $this->getObject("GroupUser", $id);
     }
 
     public function getRoleForLoginUser($group_id, $user_id)
@@ -558,4 +541,27 @@ public function getSettingByKey(string $key)
             return $this->getObject('UserSetting', ['user_id' => $this->user()->id, 'setting_key' => $key]);
         }
     }
+
+    /**
+     * Function to recursively check if a user is a member of a group (or parent group)
+     * 
+     * @param int|string $group_id
+     * @param int|string $user_id
+     * @return bool
+     */
+    public function isUserGroupMemberRecursive(int|string $group_id, int|string $user_id) : bool {
+        $groupMembers = $this->getGroupMembers($group_id);
+        if (!empty($groupMembers)) {
+            foreach ($groupMembers as $groupMember) {
+                if ($groupMember->user_id === $user_id) {
+                    return true;
+                } elseif ($this->getUser($groupMember->user_id)->is_group) {
+                    if ($this->isUserGroupMemberRecursive($groupMember->user_id, $user_id)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/system/modules/insights/actions/index.php b/system/modules/insights/actions/index.php
index 95762e075..c4a655602 100644
--- a/system/modules/insights/actions/index.php
+++ b/system/modules/insights/actions/index.php
@@ -20,14 +20,15 @@ function index_ALL(Web $w)
         foreach ($modules as $modulename => $insights) {
             if (!empty($insights)) {
                 foreach ($insights as $insight) {
+                    $insight_class = get_class($insight);
                     $userHasAccess = false;
-                    if (InsightService::getInstance($w)->IsMember(Get_class($insight), $user_id)) {
+                    if (InsightService::getInstance($w)->IsMember($insight_class, $user_id)) {
                         $userHasAccess = true;
                     } else {
                         // check if this user is a member of a group (or parent group) with access to this insight report
-                        $allMembers = InsightService::getInstance($w)->getAllMembersForInsightClass(Get_class($insight));
+                        $allMembers = InsightService::getInstance($w)->getAllMembersForInsightClass($insight_class);
                         foreach ($allMembers as $member) {
-                            $userHasAccess = checkUserAccess($w, $member->user_id, $user_id);  // $member->user_id may be a user or a group
+                            $userHasAccess = InsightService::getInstance($w)->checkUserAccess($member->user_id, $user_id);  // $member->user_id may be a user or a group
                             if ($userHasAccess) {
                                 break;
                             };
@@ -36,14 +37,14 @@ function index_ALL(Web $w)
                     if ($userHasAccess) {
                         $row = [];
                         // add values to the row in the same order as the table headers
-                        $row[] = Html::a('/insights/viewInsight/' . Get_class($insight), $insight->name);
+                        $row[] = Html::a('/insights/viewInsight/' . $insight_class, $insight->name);
                         $row[] = $modulename;
                         $row[] = $insight->description;
                         // the actions column is used to hold buttons that link to actions per insight. Note the insight id is added to the href on these buttons.
                         $actions = [];
-                        $actions[] = Html::b('/insights/viewInsight/' . Get_class($insight), 'View');
-                        if (InsightService::getInstance($w)->isInsightOwner($user_id, get_class($insight))) {
-                            $actions[] = Html::b('/insights/manageMembers?insight_class=' . Get_class($insight), 'Manage Members');
+                        $actions[] = Html::b('/insights/viewInsight/' . $insight_class, 'View');
+                        if (InsightService::getInstance($w)->isInsightOwner($user_id, $insight_class)) {
+                            $actions[] = Html::b('/insights/manageMembers?insight_class=' . $insight_class, 'Manage Members');
                         }
                         $row[] = implode('', $actions);
                         $table[] = $row;
@@ -56,20 +57,3 @@ function index_ALL(Web $w)
     //send the table to the template using ctx
     $w->ctx('insightTable', Html::table($table, 'insight_table', 'tablesorter', $tableHeaders));
 }
-
-// Function to recursively check if a user is a member of a group (or parent group)
-function checkUserAccess(Web $w, $group, $user_id) : bool {
-    $groupMembers = AuthService::getInstance($w)->getGroupMembers($group);
-    if (!empty($groupMembers)) {
-        foreach ($groupMembers as $groupMember) {
-            if ($groupMember->user_id === $user_id) {
-                return true;
-            } elseif (AuthService::getInstance($w)->getUser($groupMember->user_id)->is_group) {
-                if (checkUserAccess($w, $groupMember->user_id, $user_id)) {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
diff --git a/system/modules/insights/models/InsightService.php b/system/modules/insights/models/InsightService.php
index 4aca0a518..9326ceeb9 100644
--- a/system/modules/insights/models/InsightService.php
+++ b/system/modules/insights/models/InsightService.php
@@ -101,7 +101,7 @@ public function getInsightPermissions()
     }
 
     //check if user is a member of an insight
-    public function IsMember($insight_class_name, $user_id)
+    public function isMember($insight_class_name, $user_id)
     {
 
         if (AuthService::getInstance($this->w)->getUser($user_id)->hasRole('insights_admin')) {
@@ -115,9 +115,9 @@ public function IsMember($insight_class_name, $user_id)
     }
 
     //retrieve a specific member matching the id given number
-    public function GetMemberForId($id)
+    public function getMemberForId($id)
     {
-        return $this->GetObject('InsightMembers', $id);
+        return $this->getObject('InsightMembers', $id);
     }
 
     public function getInsightInstance(string $insight_class)
@@ -138,15 +138,6 @@ public function isInsightOwner($user_id, $insight_class)
         }
     }
 
-    // convert dd/mm/yyyy date to yyyy-mm-dd for SQL statements
-    public function date2db($date)
-    {
-        if ($date) {
-            $formatteddate = formatDate($date, 'Y-m-d');
-            return $formatteddate;
-        }
-    }
-
     // export a recordset as CSV
     public function exportcsv($run_data, $title)
     {
@@ -253,7 +244,7 @@ public function exportpdf($run_data, $title, $report_template_id = null, $layout
                     }
                 }
                 if (!empty($report_template_id) && !empty($templatedata)) {
-                    $results = $this->w->Template->render(
+                    $results = TemplateService::getInstance($this->w)->render(
                         $report_template_id,
                         ["data" => $templatedata, "w" => $this->w, "POST" => $_POST]
                     );
diff --git a/system/templates/layout-bootstrap-5.tpl.php b/system/templates/layout-bootstrap-5.tpl.php
index ae0139be2..92710bcab 100644
--- a/system/templates/layout-bootstrap-5.tpl.php
+++ b/system/templates/layout-bootstrap-5.tpl.php
@@ -214,7 +214,7 @@
             </div>
             <div id="menu-overlay" data-toggle-menu="close"></div>
         </div>
-        <div class="container-xl" id="body-content">
+        <div class="container-fluid" id="body-content">
             <?php
             if (!empty($error)) {
                 echo HtmlBootstrap5::alertBox($error, "alert-warning");