diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 32363bd..7ac819c 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -36,11 +36,14 @@ $numColumns = count($columns);
             <tbody>
                 <tr class="table-secondary">
                     <td colspan="<?php echo $numColumns; ?>">
-                        <p class="h6 fw-bold m-0">Ad-hoc groups</p>
+                        <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="false">
+                            Ad-hoc groups
+                            <i class="fa fa-caret-up fa-sm"></i>
+                        </button>
                     </td>
                 </tr>
                 <?php foreach ($groupmemberships as $key => $group) : ?>
-                    <tr>
+                    <tr class="collapse collapse-adhoc-group-parent show">
                         <td class="pl-3"><a href="<?php echo $this->Html->url(
                                                         array(
                                                             'controller' => 'grouper_groups',
@@ -66,11 +69,14 @@ $numColumns = count($columns);
             <tbody>
                 <tr class="table-secondary">
                     <td colspan="<?php echo $numColumns; ?>">
-                        <p class="h6 fw-bold m-0">Working groups</p>
+                        <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="false">
+                            Working groups
+                            <i class="fa fa-caret-up fa-sm"></i>
+                        </button>
                     </td>
                 </tr>
                 <?php foreach ($wgmemberships as $wggroup) : ?>
-                    <tr class="table-light">
+                    <tr class="table-light collapse collapse-wg-working-group-parent show">
                         <td colspan="<?php echo $numColumns - 2; ?>">
                             <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0 collapsed" data-toggle="collapse" data-target=".collapse-wg-<?php echo $wggroup['WGName']; ?>" role="button" aria-expanded="false">
                                 <?php echo $wggroup['WGName'] ?? "No Name"; ?>
@@ -78,7 +84,7 @@ $numColumns = count($columns);
                             </button>
                         </td>
                         <td>
-                          <?php echo $wggroup['workingDesc'] ?? " "; ?>
+                            <?php echo $wggroup['workingDesc'] ?? " "; ?>
                         </td>
                         <td>
                             <?php echo $wggroup['optOut'] ? $this->element('GrouperLite.Components/optAction', array(
@@ -105,9 +111,9 @@ $numColumns = count($columns);
                                 <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
                             <?php endif; ?>
                             <?php if (strpos($group['WGApp'], '@lists') !== false) : ?>
-                                <td><?php echo _txt('pl.grouperlite.value.email' ); ?></td>
-                            <?php else: ?>
-                                <td><?php echo _txt('pl.grouperlite.value.'.$group['WGApp'] ) ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+                                <td><?php echo _txt('pl.grouperlite.value.email'); ?></td>
+                            <?php else : ?>
+                                <td><?php echo _txt('pl.grouperlite.value.' . $group['WGApp']) ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
                             <?php endif; ?>
                             <td>
 
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index a4450b2..1157bea 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -36,11 +36,14 @@ $numColumns = count($columns);
       <tbody>
         <tr class="table-secondary">
           <td colspan="<?php echo $numColumns; ?>">
-            <p class="h6 fw-bold m-0">Ad-hoc groups</p>
+            <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="false">
+              Ad-hoc groups
+              <i class="fa fa-caret-up fa-sm"></i>
+            </button>
           </td>
         </tr>
         <?php foreach ($groupoptins as $key => $group) : ?>
-          <tr>
+          <tr class="collapse collapse-adhoc-group-parent show">
             <td class="pl-3"><a href="<?php echo $this->Html->url(
                                         array(
                                           'controller' => 'grouper_groups',
@@ -64,11 +67,14 @@ $numColumns = count($columns);
       <tbody>
         <tr class="table-secondary">
           <td colspan="<?php echo $numColumns; ?>">
-            <p class="h6 fw-bold m-0">Working groups</p>
+            <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="false">
+              Working groups
+              <i class="fa fa-caret-up fa-sm"></i>
+            </button>
           </td>
         </tr>
         <?php foreach ($wgoptins as $i => $wgoptin) : ?>
-          <tr class="table-">
+          <tr class="table- collapse collapse-wg-working-group-parent show">
             <td colspan="<?php echo $numColumns - 2; ?>">
               <span class="h6"><?php echo $wgoptin['WGName'] ?? "No Name"; ?></span>
             </td>