diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 9b1f66f..918fa6e 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -37,7 +37,10 @@ $numColumns = count($columns);
       <tbody>
         <tr class="table-secondary">
           <td colspan="<?php echo $numColumns; ?>">
-            <p class="h6 fw-bold m-0">Ad-hoc groups</>
+            <button type="button" class="btn btn-link btn-text collapse-btn collapsed 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-right fa-sm"></i>
+            </button>
           </td>
         </tr>
         <?php if (count($groupsowners) < 1) : ?>
@@ -48,7 +51,7 @@ $numColumns = count($columns);
           </tr>
         <?php endif; ?>
         <?php foreach ($groupsowners as $group) : ?>
-          <tr>
+          <tr class="collapse collapse-adhoc-group-parent">
             <td class="pl-3"><a href="<?php echo $this->Html->url(
                                         array(
                                           'controller' => 'grouper_groups',
@@ -99,15 +102,18 @@ $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-down fa-sm"></i>
+            </button>
           </td>
         </tr>
         <?php foreach ($wgowners as $wgowner) : ?>
-          <tr class="table-light">
+          <tr class="table-light collapse collapse-wg-working-group-parent show">
             <td colspan="<?php echo $numColumns; ?>">
-              <button type="button" class="btn btn-link btn-text collapse-btn h6 fw-bold m-0 collapsed" data-toggle="collapse" data-target=".collapse-wg-<?php echo $wgowner['WGName']; ?>" role="button" aria-expanded="false">
+              <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 $wgowner['WGName']; ?>" role="button" aria-expanded="false">
                 <?php echo $wgowner['WGName'] ?? "No Name"; ?>
-                <i class="fa fa-caret-down fa-sm"></i>
+                <i class="fa fa-caret-right fa-sm"></i>
               </button>
             </td>
           </tr>
@@ -155,6 +161,31 @@ $numColumns = count($columns);
               </td>
             </tr>
           <?php endforeach; ?>
+          <?php foreach ($wggroup['Groups'] as $key => $group) : ?>
+            <tr class="collapse collapse-wg-<?php echo $wggroup['WGName']; ?>" id="collapse-wg-<?php echo $wggroup['WGName'] . '-' . $key; ?>">
+              <td class="pl-3">
+                <a href="<?php echo $this->Html->url(
+                            array(
+                              'controller' => 'grouper_groups',
+                              'action' => 'groupinfo',
+                              '?' => array('groupname' => urlencode($group['name']))
+                            )
+                          ) ?>" title="<?php echo $group['name']; ?>">
+                  <?php echo $group['WGApp'] ?? "No Name"; ?></a>
+              </td>
+              <?php if ($isuserowner === 'T') : ?>
+                <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>
+              <?php endif; ?>
+              <td>
+
+              </td>
+            </tr>
+          <?php endforeach; ?>
         <?php endforeach; ?>
       </tbody>
     </table>