diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 28c843b..29d9e81 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -76,7 +76,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
                 <button class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap members-btn" data-id="<?php echo urlencode($group['name']) ?>">
                   <?php echo _txt('pl.grouperlite.action.members'); ?> <em class="material-icons mt-0" aria-hidden="true">group</em>
                 </button>
-                <?php if ($isuserowner === 'T') : ?>
+                <?php if ($isuserowner === 'T' && $isGrouperVisible === 'T') : ?>
                   <?php
                   $baseUrl = $grouperbaseurl;
                   $path = '/grouper/grouperUi/app/UiV2Main.index';
@@ -131,7 +131,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
                 <button class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap members-btn" data-id="<?php echo $wggroup['WGName']; ?>">
                   <?php echo _txt('pl.grouperlite.action.members'); ?> <em class="material-icons mt-0" aria-hidden="true">group</em>
                 </button>
-                <?php if ($isuserowner === 'T') : ?>
+                <?php if ($isuserowner === 'T' && $isGrouperVisible === 'T') : ?>
                   <?php
                   $baseUrl = $grouperbaseurl;
                   $path = '/grouper/grouperUi/app/UiV2Main.index';
@@ -183,7 +183,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
             </tr>
           <?php endforeach;*/ ?>
           <?php foreach ($wggroup['Groups'] as $key => $group) : ?>
-            <tr class="<?php echo $collapsed ? 'collapse' : 'show'; ?> collapse-wg-<?php echo $wggroup['WGName']; ?>" id="collapse-wg-<?php echo $wggroup['WGName'] . '-' . $key; ?>">
+            <tr class="<?php echo $collapsed ? 'collapse' : 'show'; ?> collapse-wg-working-group collapse-wg-<?php echo $wggroup['WGName']; ?>" id="collapse-wg-<?php echo $wggroup['WGName'] . '-' . $key; ?>">
               <td class="pl-3"><?php echo $group['WGApp'] ?? "No Name"; ?></td>
               <?php if ($isuserowner === 'T') : ?>
                 <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>