diff --git a/Lib/lang.php b/Lib/lang.php
index b4df823..0eaeaea 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -96,6 +96,7 @@
   'pl.grouperlite.action.view-in-grouper' => 'View in Grouper',
   'pl.grouperlite.action.view-members' => 'View members',
   'pl.grouperlite.action.close' => 'Close',
+  'pl.grouperlite.action.clear' => 'Clear',
 
   'pl.grouperlite.form.group.template.label' => 'Select a template',
   'pl.grouperlite.form.group.template.empty' => '(choose one)',
@@ -133,5 +134,7 @@
   'pl.grouperlite.search.tags.text' => 'Search',
 
   'pl.grouperlite.pagination.counter' => 'Viewing {:start}-{:end} of {:count}',
-  'pl.grouperlite.attributes.zero-state' => 'No Attributes Associated to this Group.'
+  'pl.grouperlite.attributes.zero-state' => 'No Attributes Associated to this Group.',
+  'pl.grouperlite.groups.zero-state' => 'No groups found.',
+  'pl.grouperlite.working-groups.zero-state' => 'No working groups found.'
 );
\ No newline at end of file
diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
index 2c0ff8b..8710b23 100644
--- a/View/Elements/Components/groupattributes.ctp
+++ b/View/Elements/Components/groupattributes.ctp
@@ -1,25 +1,27 @@
-<table class="table table-striped w-100">
-    <thead>
-        <tr>
-            <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
-            <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
-            <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php foreach ($attributes as $attr) : ?>
+<?php if (count($attributes) > 0) : ?>
+    <table class="table table-striped w-100">
+        <thead>
             <tr>
-                <td><?php echo $attr['attributeDefNameName']; ?></td>
-                <td><?php echo $attr['attributeDefName'] ?></td>
-                <td>
-                    <a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                        <?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
-                    </a>
-                </td>
+                <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
+                <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
+                <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
             </tr>
-        <?php endforeach; ?>
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+            <?php foreach ($attributes as $attr) : ?>
+                <tr>
+                    <td><?php echo $attr['attributeDefNameName']; ?></td>
+                    <td><?php echo $attr['attributeDefName'] ?></td>
+                    <td>
+                        <a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
+                            <?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
+                        </a>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+        </tbody>
+    </table>
+<?php endif; ?>
 <?php if (count($attributes) < 1) : ?>
     <div class="alert alert-info">
         <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.attributes.zero-state'); ?></p>
diff --git a/View/Elements/Components/navigation-emaillists.ctp b/View/Elements/Components/navigation-emaillists.ctp
index 60b3856..6b478db 100644
--- a/View/Elements/Components/navigation-emaillists.ctp
+++ b/View/Elements/Components/navigation-emaillists.ctp
@@ -40,15 +40,15 @@
     <?php if ($isuserowner === 'T') { ?>
         <div class="align-self-center">
             <?php
-            $createEmailUrl = $this->Html->url(
+            $createTemplateGroupUrl = $this->Html->url(
                 array(
                     'controller' => 'grouper_groups',
-                    'action' => 'groupcreatetemplateform'
+                    'action' => 'groupcreatetemplate'
                 )
             );
             ?>
-            <a href="<?php echo $createEmailUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
-                <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-email'); ?>
+            <a href="<?php echo $createTemplateGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
+                <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-working-group'); ?>
             </a>
         </div>
     <?php } ?>
diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp
index 6ac08f5..cf6504a 100644
--- a/View/Elements/Components/optAction.ctp
+++ b/View/Elements/Components/optAction.ctp
@@ -1,8 +1,9 @@
 <?php echo $this->Form->create(false, array(
   'url' => array('controller' => 'grouper_groups', 'action' => $action),
-  'class' => 'd-flex justify-content-center'
+  'class' => 'd-flex justify-content-center',
+  'id' => 'join-group.' . $idx
 )); ?>
-<?php print $this->Form->hidden('GroupName', array('default' => $group)); ?>
+<?php print $this->Form->hidden('GroupName', array('default' => $group, 'id' => 'groupName.'.$idx)); ?>
 <button class="btn btn-block btn-<?php echo $member ? 'danger' : 'success'; ?>" type="submit">
     <?php echo $member ? _txt('pl.grouperlite.action.leave') : _txt('pl.grouperlite.action.join') ?> &nbsp;
     <i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
index 8e01ef4..6375a3c 100644
--- a/View/Elements/Components/search.ctp
+++ b/View/Elements/Components/search.ctp
@@ -27,8 +27,9 @@
             <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
             <div class="input-group-append">
                 <?php if (isset($searchcriteria) && $searchcriteria !== '') { ?>
-                    <button class="btn btn-grouper btn-outline-secondary shadow-none" type="button" value="Clear" id="reset-search">
+                    <button class="btn btn-grouper btn-outline-secondary shadow-none" type="button" value="Clear" id="reset-search" aria-label="<?php echo _txt("pl.grouperlite.action.clear"); ?>">
                         <i class="fa fa-times"></i>
+                        <span class="sr-only"><?php echo _txt("pl.grouperlite.action.clear"); ?></span>
                     </button>
                 <?php } ?>
                 <button class="btn btn-grouper btn-primary px-4" type="submit" value="Submit">
diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp
index 54aaf95..f6f2c43 100644
--- a/View/GrouperGroups/base.ctp
+++ b/View/GrouperGroups/base.ctp
@@ -12,7 +12,7 @@ $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => '
 <div id="grouper-plugin" class="grouper pt-2">
     <div class="d-flex align-items-center mb-4">
         <?php print $this->Html->image('GrouperLite.Grouper.jpg', array('class' => 'img-fluid mr-2', 'style' => 'height: 50px')); ?>
-        <h2><?php echo $title; ?></h2>
+        <h1 class="h2"><?php echo $title; ?></h1>
         <!--<div class="ml-auto"><a href="#">Why Grouper?</a></div>-->
     </div>
     <?php echo $this->fetch('content'); ?>
diff --git a/View/GrouperGroups/emaillistsmanage.ctp b/View/GrouperGroups/emaillistsmanage.ctp
index 7080913..09793f6 100644
--- a/View/GrouperGroups/emaillistsmanage.ctp
+++ b/View/GrouperGroups/emaillistsmanage.ctp
@@ -2,53 +2,61 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.title.emaillists-manage')); ?>
 <?php echo $this->element('Components/navigation-emaillists', array('active' => 'emaillistsmanage', 'create' => true)); ?>
 <?php echo $this->element('Components/search', array('active' => 'emaillistsmanaged')); ?>
-<div class="">
-    <table class="table table-striped w-100 mb-0">
-        <thead>
-            <tr>
-                <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                <th class="group groups"><?php echo _txt('pl.grouperlite.table.groups'); ?></th>
-                <th class="group groups"><?php echo _txt('pl.grouperlite.table.open'); ?></th>
-                <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <td><?php echo $this->Html->link(
-                        isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "--",
-                        array(
-                            'controller' => 'grouper_groups',
-                            'action' => 'emaillistinfo',
-                            '?' => array('groupname' => urlencode($group['name']))
-                        )
-                    ) ?></td>
-                <td><?php echo isset($group['description']) ? $group['description'] : "--"; ?></td>
-                <td>
-                    <a href="#"><?php echo _txt('pl.grouperlite.table.user-type-members'); ?> (10)</a> |
-                    <a href="#"><?php echo _txt('pl.grouperlite.table.user-type-moderators'); ?> (2)</a> |
-                    <a href="#"><?php echo _txt('pl.grouperlite.table.user-type-owners'); ?> (1)</a>
-                </td>
-                <td><?php echo isset($group['open']) && $group['open'] === 'T' ? _txt('pl.grouperlite.table.status-open') : _txt('pl.grouperlite.table.status-moderated'); ?></td>
-                <td class="text-right">
-                    <span class="d-flex flex-column flex-lg-row justify-content-center align-items-center">
-                        <button class="btn btn-grouper btn btn-raised btn btn-primary w-50 mr-1" disabled>
-                            <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
-                            <i class="fa fa-pencil fa-sm"></i>
-                        </button>
-                        <button class="btn btn-grouper btn btn-raised btn btn-danger ml-1 flex-fill" disabled>
-                            <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
-                            <i class="fa fa-ban fa-sm"></i>
-                        </button>
-                    </span>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-    )); ?>
-</div>
\ No newline at end of file
+
+<?php if (count($emailgroups) > 0) : ?>
+    <div class="">
+        <table class="table table-striped w-100 mb-0">
+            <thead>
+                <tr>
+                    <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
+                    <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
+                    <th class="group groups"><?php echo _txt('pl.grouperlite.table.groups'); ?></th>
+                    <th class="group groups"><?php echo _txt('pl.grouperlite.table.open'); ?></th>
+                    <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td><?php echo $this->Html->link(
+                            isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "--",
+                            array(
+                                'controller' => 'grouper_groups',
+                                'action' => 'emaillistinfo',
+                                '?' => array('groupname' => urlencode($group['name']))
+                            )
+                        ) ?></td>
+                    <td><?php echo isset($group['description']) ? $group['description'] : "--"; ?></td>
+                    <td>
+                        <a href="#"><?php echo _txt('pl.grouperlite.table.user-type-members'); ?> (10)</a> |
+                        <a href="#"><?php echo _txt('pl.grouperlite.table.user-type-moderators'); ?> (2)</a> |
+                        <a href="#"><?php echo _txt('pl.grouperlite.table.user-type-owners'); ?> (1)</a>
+                    </td>
+                    <td><?php echo isset($group['open']) && $group['open'] === 'T' ? _txt('pl.grouperlite.table.status-open') : _txt('pl.grouperlite.table.status-moderated'); ?></td>
+                    <td class="text-right">
+                        <span class="d-flex flex-column flex-lg-row justify-content-center align-items-center">
+                            <button class="btn btn-grouper btn btn-raised btn btn-primary w-50 mr-1" disabled>
+                                <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
+                                <i class="fa fa-pencil fa-sm"></i>
+                            </button>
+                            <button class="btn btn-grouper btn btn-raised btn btn-danger ml-1 flex-fill" disabled>
+                                <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
+                                <i class="fa fa-ban fa-sm"></i>
+                            </button>
+                        </span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <?php print $this->element("pagination", array(
+            'goto' => false,
+            'limit' => true,
+            'numbers' => true,
+            'counter' => false
+        )); ?>
+    </div>
+<?php endif; ?>
+<?php if (count($emailgroups) < 1) : ?>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.working-groups.zero-state'); ?></p>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/emaillistsmember.ctp b/View/GrouperGroups/emaillistsmember.ctp
index 3da5f92..e1f61d0 100644
--- a/View/GrouperGroups/emaillistsmember.ctp
+++ b/View/GrouperGroups/emaillistsmember.ctp
@@ -3,43 +3,51 @@
 <?php echo $this->element('Components/navigation-emaillists', array('active' => 'emaillistsmember')); ?>
 <?php echo $this->element('Components/search', array('active' => 'emaillistsmember')); ?>
 
-<div class="">
-    <table class="table table-striped w-100 mb-0">
-        <thead>
-            <tr>
-                <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($emailgroups as $group) : ?>
-            <tr>
-                <td><?php echo $this->Html->link(
+<?php if (count($emailgroups) > 0) : ?>
+    <div class="">
+        <table class="table table-striped w-100 mb-0">
+            <thead>
+                <tr>
+                    <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
+                    <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
+                    <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($emailgroups as $key => $group) : ?>
+                    <tr>
+                        <td><?php echo $this->Html->link(
 
-                    isset($group['name']) ? $group['domain'].':'.$group['name'] : "No Name",
-                    array(
-                        'controller' => 'grouper_groups',
-                        'action' => 'emaillistinfo',
-                        '?' => array('groupname' => urlencode($group['name']))
-                    )
-                ) ?></td>
-                <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                <td>
-                  <?php echo $group['optedin'] ? $this->element('GrouperLite.Components/optAction', array(
-                    'member' => $group['optedin'],
-                    'action' => 'leavegroup',
-                    'group' => $group['name']
-                  )) : ''; ?>
-                </td>
-            </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-    )); ?>
-</div>
\ No newline at end of file
+                                isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name",
+                                array(
+                                    'controller' => 'grouper_groups',
+                                    'action' => 'emaillistinfo',
+                                    '?' => array('groupname' => urlencode($group['name']))
+                                )
+                            ) ?></td>
+                        <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+                        <td>
+                            <?php echo $group['optedin'] ? $this->element('GrouperLite.Components/optAction', array(
+                                'member' => $group['optedin'],
+                                'action' => 'leavegroup',
+                                'group' => $group['name'],
+                                'idx' => $key
+                            )) : ''; ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+        <?php print $this->element("pagination", array(
+            'goto' => false,
+            'limit' => true,
+            'numbers' => true,
+            'counter' => false
+        )); ?>
+    </div>
+<?php endif; ?>
+<?php if (count($emailgroups) < 1) : ?>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.working-groups.zero-state'); ?></p>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/emaillistsoptin.ctp b/View/GrouperGroups/emaillistsoptin.ctp
index b1460f4..11992bd 100644
--- a/View/GrouperGroups/emaillistsoptin.ctp
+++ b/View/GrouperGroups/emaillistsoptin.ctp
@@ -2,42 +2,48 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.title.emaillists-join')); ?>
 <?php echo $this->element('Components/navigation-emaillists', array('active' => 'emaillistsoptin')); ?>
 <?php echo $this->element('Components/search', array('active' => 'emaillistsoptin')); ?>
-
-<div class="">
-    <table class="table table-striped w-100 mb-0">
-        <thead>
-            <tr>
-                <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($emailgroups as $group) : ?>
-            <tr>
-                <td><?php echo $this->Html->link(
-                        isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name",
-                        array(
-                            'controller' => 'grouper_groups',
-                            'action' => 'emaillistinfo',
-                            '?' => array('groupname' => urlencode($group['name']))
-                        )
-                    ) ?></td>
-                <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                <td class="text-center">
-                    <button class="btn btn-raised btn-success" type="submit">
-                        <?php echo _txt('pl.grouperlite.action.subscribe') ?>
-                        <i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
-                    </button>
-                </td>
-            </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-    )); ?>
-</div>
\ No newline at end of file
+<?php if (count($emailgroups) > 0) : ?>
+    <div class="">
+        <table class="table table-striped w-100 mb-0">
+            <thead>
+                <tr>
+                    <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
+                    <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
+                    <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($emailgroups as $group) : ?>
+                    <tr>
+                        <td><?php echo $this->Html->link(
+                                isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name",
+                                array(
+                                    'controller' => 'grouper_groups',
+                                    'action' => 'emaillistinfo',
+                                    '?' => array('groupname' => urlencode($group['name']))
+                                )
+                            ) ?></td>
+                        <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+                        <td class="text-center">
+                            <button class="btn btn-raised btn-success" type="submit">
+                                <?php echo _txt('pl.grouperlite.action.subscribe') ?>
+                                <i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
+                            </button>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+        <?php print $this->element("pagination", array(
+            'goto' => false,
+            'limit' => true,
+            'numbers' => true,
+            'counter' => false
+        )); ?>
+    </div>
+<?php endif; ?>
+<?php if (count($emailgroups) < 1) : ?>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.working-groups.zero-state'); ?></p>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp
index 57c6176..d8695bd 100644
--- a/View/GrouperGroups/groupinfo.ctp
+++ b/View/GrouperGroups/groupinfo.ctp
@@ -50,11 +50,11 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
 </div>
 
 <?php if ($isuserowner === 'T') : ?>
-    <div class="modal modal-primary fade" tabindex="-1" id="subscribers">
+    <div class="modal modal-primary fade" tabindex="-1" id="subscribers" aria-labelledby="modal-title">
         <div class="modal-dialog modal-dialog-scrollable">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title"><?php echo _txt('pl.grouperlite.group.info.members-heading'); ?></h5>
+                    <h5 class="modal-title" id="modal-title"><?php echo _txt('pl.grouperlite.group.info.members-heading'); ?></h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index d4fb8b3..734a40c 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -2,48 +2,56 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.memberships')); ?>
 <?php echo $this->element('GrouperLite.Components/navigation-groups', array('active' => 'groupmember')); ?>
 <?php echo $this->element('GrouperLite.Components/search', array('active' => 'groupmember')); ?>
-<div class="">
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => false,
-        'numbers' => false,
-        'counter' => true,
-        'class' => 'counter'
-    )); ?>
-    <table class="table table-striped w-100 mb-0">
-        <thead>
-            <tr>
-                <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($groupergroupmemberships as $group) : ?>
+<?php if (count($groupergroupmemberships) > 0) : ?>
+    <div class="">
+        <?php print $this->element("pagination", array(
+            'goto' => false,
+            'limit' => false,
+            'numbers' => false,
+            'counter' => true,
+            'class' => 'counter'
+        )); ?>
+        <table class="table table-striped w-100 mb-0">
+            <thead>
                 <tr>
-                    <td><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 isset($group['friendlyName']) ? $group['friendlyName'] : "No Name"; ?></a></td>
-                    <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                    <td>
-                        <?php echo $group['optOut'] ? $this->element('GrouperLite.Components/optAction', array(
-                            'member' => $group['optOut'],
-                            'action' => 'leavegroup',
-                            'group' => $group['name']
-                        )) : ''; ?>
-                    </td>
+                    <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
+                    <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
+                    <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
                 </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-    )); ?>
-</div>
\ No newline at end of file
+            </thead>
+            <tbody>
+                <?php foreach ($groupergroupmemberships as $key => $group) : ?>
+                    <tr>
+                        <td><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 isset($group['friendlyName']) ? $group['friendlyName'] : "No Name"; ?></a></td>
+                        <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+                        <td>
+                            <?php echo $group['optOut'] ? $this->element('GrouperLite.Components/optAction', array(
+                                'member' => $group['optOut'],
+                                'action' => 'leavegroup',
+                                'group' => $group['name'],
+                                'idx' => $key
+                            )) : ''; ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+        <?php print $this->element("pagination", array(
+            'goto' => false,
+            'limit' => true,
+            'numbers' => true,
+            'counter' => false
+        )); ?>
+    </div>
+<?php endif; ?>
+<?php if (count($groupergroupmemberships) < 1) : ?>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index a3acc65..e17a2c7 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -2,6 +2,7 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.groups-can-join')); ?>
 <?php echo $this->element('GrouperLite.Components/navigation-groups', array('active' => 'groupoptin')); ?>
 <?php echo $this->element('GrouperLite.Components/search', array('active' => 'groupoptin')); ?>
+<?php if (count($groupergroupoptin) > 0) : ?>
 <div class="">
     <?php print $this->element("pagination", array(
         'goto' => false,
@@ -19,7 +20,7 @@
             </tr>
         </thead>
         <tbody>
-            <?php foreach ($groupergroupoptin as $group) : ?>
+            <?php foreach ($groupergroupoptin as $key => $group) : ?>
                 <tr>
                     <td><a href="<?php echo $this->Html->url(
                                         array(
@@ -33,7 +34,8 @@
                         <?php echo $this->element('GrouperLite.Components/optAction', array(
                             'member' => $group['member'],
                             'action' => 'joingroup',
-                            'group' => $group['name']
+                            'group' => $group['name'],
+                            'idx' => $key
                         )); ?>
                     </td>
                 </tr>
@@ -46,4 +48,10 @@
         'numbers' => true,
         'counter' => false
     )); ?>
-</div>
\ No newline at end of file
+</div>
+<?php endif; ?>
+<?php if (count($groupergroupoptin) < 1) : ?>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index b4a1cae..0654d39 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -2,55 +2,63 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.groups-presided')); ?>
 <?php echo $this->element('Components/navigation-groups', array('active' => 'groupowner')); ?>
 <?php echo $this->element('Components/search', array('active' => 'groupowner')); ?>
-<div class="">
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => false,
-        'numbers' => false,
-        'counter' => true,
-        'class' => 'counter'
-    )); ?>
-    <table class="table table-striped w-100 mb-0">
-        <thead>
-            <tr>
-                <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                <th class="group status"><?php echo _txt('pl.grouperlite.table.status'); ?></th>
-                <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($groupergroupsowner as $group) : ?>
+
+<?php if (count($groupergroupsowner) > 0) : ?>
+    <div class="">
+        <?php print $this->element("pagination", array(
+            'goto' => false,
+            'limit' => false,
+            'numbers' => false,
+            'counter' => true,
+            'class' => 'counter'
+        )); ?>
+        <table class="table table-striped w-100 mb-0">
+            <thead>
                 <tr>
-                    <td><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 isset($group['friendlyName']) ? $group['friendlyName'] : "No Name"; ?></a></td>
-                    <td><?php echo isset($group['description']) ? $group['description'] : "No Description"; ?></td>
-                    <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? 'Enabled' : 'Disabled'; ?></td>
-                    <td class="text-center">
-                        <span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
-                            <button class="btn btn-grouper btn btn-primary btn btn-block" disabled>
-                                <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
-                                <i class="fa fa-pencil fa-sm"></i>
-                            </button>
-                            <button class="btn btn-grouper btn btn-danger btn btn-block ml-1 mt-0" disabled>
-                                <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
-                                <i class="fa fa-ban fa-sm"></i>
-                            </button>
-                        </span>
-                    </td>
+                    <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
+                    <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
+                    <th class="group status"><?php echo _txt('pl.grouperlite.table.status'); ?></th>
+                    <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
                 </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-    )); ?>
-</div>
\ No newline at end of file
+            </thead>
+            <tbody>
+                <?php foreach ($groupergroupsowner as $group) : ?>
+                    <tr>
+                        <td><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 isset($group['friendlyName']) ? $group['friendlyName'] : "No Name"; ?></a></td>
+                        <td><?php echo isset($group['description']) ? $group['description'] : "No Description"; ?></td>
+                        <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? 'Enabled' : 'Disabled'; ?></td>
+                        <td class="text-center">
+                            <span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
+                                <button class="btn btn-grouper btn btn-primary btn btn-block" disabled>
+                                    <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
+                                    <i class="fa fa-pencil fa-sm"></i>
+                                </button>
+                                <button class="btn btn-grouper btn btn-danger btn btn-block ml-1 mt-0" disabled>
+                                    <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
+                                    <i class="fa fa-ban fa-sm"></i>
+                                </button>
+                            </span>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+        <?php print $this->element("pagination", array(
+            'goto' => false,
+            'limit' => true,
+            'numbers' => true,
+            'counter' => false
+        )); ?>
+    </div>
+<?php endif; ?>
+<?php if (count($groupergroupsowner) < 1) : ?>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
+    </div>
+<?php endif; ?>
\ No newline at end of file