diff --git a/Lib/lang.php b/Lib/lang.php
index 80f2baf..cecac6e 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -20,6 +20,9 @@
   'pl.grouperlite.nav.emaillists' => 'Email Lists',
   'pl.grouperlite.nav.groups' => 'Groups',
 
+  'pl.grouperlite.dashboard.heading.groups' => 'Groups',
+  'pl.grouperlite.dashboard.heading.email-lists' => 'Email lists',
+
   'pl.grouperlite.title.root' => 'Grouper Collaborations:',
   'pl.grouperlite.title.groupinfo' => 'Group configuration and attributes',
   'pl.grouperlite.title.groupowner' => 'Groups I manage',
@@ -120,6 +123,7 @@
   'pl.grouperlite.form.template.value.internet2' => 'Internet2',
   'pl.grouperlite.form.template.value.incommon' => 'Incommon',
   'pl.grouperlite.form.template.is-optin.label' => 'Is optin?',
+  'pl.grouperlite.form.template.is-moderated.label' => 'Is moderated?',
   'pl.grouperlite.form.template.add-wiki.label' => 'Add wiki?',
   'pl.grouperlite.form.template.add-project.label' => 'Add project?',
   'pl.grouperlite.form.template.value.positive' => 'Yes',
diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp
index 6d1e03e..3a56e7f 100644
--- a/View/CoGrouperLites/display.ctp
+++ b/View/CoGrouperLites/display.ctp
@@ -48,7 +48,7 @@ echo $this->element('GrouperLite.base-styles');
                         </div>
                     </div>
                     <div class="col-xs-4 col-md-4">
-                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-users"></i>&nbsp; Groups</h6>
+                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-users"></i>&nbsp; <?php echo _txt('pl.grouperlite.dashboard.heading.groups'); ?></h6>
                         <div class="px-4 d-flex flex-column justify-content-center">
                             <a class="btn btn-primary" href="<?php print $this->Html->url(
                                                                     array(
@@ -88,7 +88,7 @@ echo $this->element('GrouperLite.base-styles');
                         </div>
                     </div>
                     <div class="col-xs-4 col-md-4 border-left">
-                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-envelope"></i>&nbsp; Email Lists</h6>
+                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-envelope"></i>&nbsp; <?php echo _txt('pl.grouperlite.dashboard.heading.email-lists'); ?></h6>
                         <div class="px-4 d-flex flex-column justify-content-center">
                             <a class="btn btn-secondary" href="<?php print $this->Html->url(
                                                                     array(
diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
index e23f097..f4589db 100644
--- a/View/Elements/Components/groupattributes.ctp
+++ b/View/Elements/Components/groupattributes.ctp
@@ -1,3 +1,4 @@
+<?php if (count($attr) > 0) : ?>
 <table class="table table-striped w-100">
     <thead>
         <tr>
@@ -20,8 +21,8 @@
         <?php endforeach; ?>
     </tbody>
 </table>
-<?php if (count($attr) < 1) : ?>
+<?php else : ?>
     <div class="alert alert-info">
-        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.attributes.zero-state'); ?></p>
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.group.info.attributes-zero-state'); ?></p>
     </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
index ca42a44..37c1491 100644
--- a/View/Elements/Components/search.ctp
+++ b/View/Elements/Components/search.ctp
@@ -21,6 +21,7 @@
 )); ?>
 <div id="search-grouper-form">
     <div class="d-flex">
+        <label class="sr-only" for="search"><?php echo _txt('pl.grouperlite.search.tags.text'); ?></label>
         <div class="input-group input-group-search">
             <?php echo $this->Form->input("search", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
             <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
diff --git a/View/Elements/base-styles.ctp b/View/Elements/base-styles.ctp
index 00ead17..694c648 100644
--- a/View/Elements/base-styles.ctp
+++ b/View/Elements/base-styles.ctp
@@ -2,7 +2,7 @@
     :root {
         --red: #CC3333;
         --blue: #1D7AB4;
-        --green: #22AA22;
+        --green: #1D871D;
         --orange: #faa732;
         --teal: #1c6070;
         --darkteal: #003f59;
diff --git a/View/Elements/pagination.ctp b/View/Elements/pagination.ctp
index 1a0b1e0..f3bafd2 100644
--- a/View/Elements/pagination.ctp
+++ b/View/Elements/pagination.ctp
@@ -36,7 +36,7 @@ $includeGoto = isset($goto) ? $goto : true;
 
 ?>
 
-<div class="<?php echo isset($class) ? $class : 'pagination' ?> d-flex justify-content-start align-items-center">
+<div class="<?php echo isset($class) ? $class : 'pagination' ?> d-flex justify-content-start align-items-center rounded-0">
     <?php if ($includeCounter) : ?>
         <div class="pagination-element pagination-counter muted">
             <?php
diff --git a/View/GrouperGroups/emaillistsmanage.ctp b/View/GrouperGroups/emaillistsmanage.ctp
index 3c3c41c..ad29831 100644
--- a/View/GrouperGroups/emaillistsmanage.ctp
+++ b/View/GrouperGroups/emaillistsmanage.ctp
@@ -3,7 +3,7 @@
 <?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">
+    <table class="table table-striped w-100 mb-0">
         <thead>
             <tr>
                 <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
@@ -45,4 +45,10 @@
             </tr>
         </tbody>
     </table>
+    <?php print $this->element("pagination", array(
+        'goto' => false,
+        'limit' => true,
+        'numbers' => true,
+        'counter' => false
+    )); ?>
 </div>
\ No newline at end of file
diff --git a/View/GrouperGroups/emaillistsmember.ctp b/View/GrouperGroups/emaillistsmember.ctp
index d678648..cb66528 100644
--- a/View/GrouperGroups/emaillistsmember.ctp
+++ b/View/GrouperGroups/emaillistsmember.ctp
@@ -4,7 +4,7 @@
 <?php echo $this->element('Components/search', array('active' => 'emaillistsmember')); ?>
 
 <div class="">
-    <table class="table table-striped w-100">
+    <table class="table table-striped w-100 mb-0">
         <thead>
             <tr>
                 <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
@@ -15,13 +15,13 @@
         <tbody>
             <tr>
                 <td><?php echo $this->Html->link(
-                    isset($group['name']) ? $group['domain'].':'.$group['name'] : "No Name",
-                    array(
-                        'controller' => 'groupergroups',
-                        'action' => 'emaillistinfo',
-                        '?' => array('groupname' => urlencode($group['name']))
-                    )
-                ) ?></td>
+                        isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name",
+                        array(
+                            'controller' => 'groupergroups',
+                            '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-danger" type="submit">
@@ -32,4 +32,10 @@
             </tr>
         </tbody>
     </table>
-</div>
+    <?php print $this->element("pagination", array(
+        'goto' => false,
+        'limit' => true,
+        'numbers' => true,
+        'counter' => false
+    )); ?>
+</div>
\ No newline at end of file
diff --git a/View/GrouperGroups/emaillistsoptin.ctp b/View/GrouperGroups/emaillistsoptin.ctp
index 2554c1d..78103da 100644
--- a/View/GrouperGroups/emaillistsoptin.ctp
+++ b/View/GrouperGroups/emaillistsoptin.ctp
@@ -4,7 +4,7 @@
 <?php echo $this->element('Components/search', array('active' => 'emaillistsoptin')); ?>
 
 <div class="">
-    <table class="table table-striped w-100">
+    <table class="table table-striped w-100 mb-0">
         <thead>
             <tr>
                 <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
@@ -32,4 +32,10 @@
             </tr>
         </tbody>
     </table>
+    <?php print $this->element("pagination", array(
+        'goto' => false,
+        'limit' => true,
+        'numbers' => true,
+        'counter' => false
+    )); ?>
 </div>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupfields.inc b/View/GrouperGroups/groupfields.inc
index f0b6322..5bccc5c 100644
--- a/View/GrouperGroups/groupfields.inc
+++ b/View/GrouperGroups/groupfields.inc
@@ -119,7 +119,7 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
                 'class' => 'form-control',
                 'id' => 'name'
             )); ?>
-            <small id="nameHelp" class="form-text text-muted">
+            <small id="nameHelp" class="form-text">
                 <?php echo _txt('pl.grouperlite.form.group.name.help'); ?>
             </small>
         </div>
@@ -155,7 +155,7 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
                 'id' => 'descr',
                 'rows' => 5
             )); ?>
-            <small id="descrHelp" class="form-text text-muted">
+            <small id="descrHelp" class="form-text">
                 <?php echo _txt('pl.grouperlite.form.group.description.help'); ?>
             </small>
         </div>
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 561fa98..3231d90 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -10,7 +10,7 @@
         'counter' => true,
         'class' => 'counter'
     )); ?>
-    <table class="table table-striped w-100">
+    <table class="table table-striped w-100 mb-0">
         <thead>
             <tr>
                 <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
@@ -39,17 +39,11 @@
                 </tr>
             <?php endforeach; ?>
         </tbody>
-        <tfoot>
-            <tr>
-                <th colspan="5">
-                    <?php print $this->element("pagination", array(
-                        'goto' => false,
-                        'limit' => true,
-                        'numbers' => true,
-                        'counter' => false
-                    )); ?>
-                </th>
-            </tr>
-        </tfoot>
     </table>
+    <?php print $this->element("pagination", array(
+        'goto' => false,
+        'limit' => true,
+        'numbers' => true,
+        'counter' => false
+    )); ?>
 </div>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index b972042..cea9b3b 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -10,7 +10,7 @@
         'counter' => true,
         'class' => 'counter'
     )); ?>
-    <table class="table table-striped w-100">
+    <table class="table table-striped w-100 mb-0">
         <thead>
             <tr>
                 <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
@@ -39,17 +39,11 @@
                 </tr>
             <?php endforeach; ?>
         </tbody>
-        <tfoot>
-            <tr>
-                <th colspan="5">
-                    <?php print $this->element("pagination", array(
-                        'goto' => false,
-                        'limit' => true,
-                        'numbers' => true,
-                        'counter' => false
-                    )); ?>
-                </th>
-            </tr>
-        </tfoot>
     </table>
+    <?php print $this->element("pagination", array(
+        'goto' => false,
+        'limit' => true,
+        'numbers' => true,
+        'counter' => false
+    )); ?>
 </div>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 593b2b3..33463c5 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -10,7 +10,7 @@
         'counter' => true,
         'class' => 'counter'
     )); ?>
-    <table class="table table-striped w-100">
+    <table class="table table-striped w-100 mb-0">
         <thead>
             <tr>
                 <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
@@ -46,17 +46,11 @@
                 </tr>
             <?php endforeach; ?>
         </tbody>
-        <tfoot>
-            <tr>
-                <th colspan="5">
-                    <?php print $this->element("pagination", array(
-                        'goto' => false,
-                        'limit' => true,
-                        'numbers' => true,
-                        'counter' => false
-                    )); ?>
-                </th>
-            </tr>
-        </tfoot>
     </table>
+    <?php print $this->element("pagination", array(
+        'goto' => false,
+        'limit' => true,
+        'numbers' => true,
+        'counter' => false
+    )); ?>
 </div>
\ No newline at end of file
diff --git a/View/GrouperGroups/templatefields.inc b/View/GrouperGroups/templatefields.inc
index 47b7d85..c01d6f0 100644
--- a/View/GrouperGroups/templatefields.inc
+++ b/View/GrouperGroups/templatefields.inc
@@ -42,16 +42,13 @@
             )); ?>
         </div>
     </div>
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.enable-email-list.label'), array(
-            'for' => 'gsh_input_isSympa',
-            'class' => "col-sm-3 col-form-label"
-        )); ?>
+    <fieldset class="form-group row py-2 bg-light">
+        <legend class="col-form-label float-sm-left col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.template.enable-email-list.label'); ?></legend>
         <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isSympa',
                 array(
-                    'label' => false,
+                    'label' => true,
                     'class' => 'form-check-input',
                     'legend' => false,
                     'id' => 'gsh_input_isSympa',
@@ -67,14 +64,14 @@
                 )
             ); ?>
         </div>
-    </div>
-    <div class="form-group row py-2 bg-light sympa-option">
-        <legend class="col-form-label col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.template.domain.label'); ?></legend>
+    </fieldset>
+    <fieldset class="form-group row py-2 bg-light sympa-option">
+        <legend class="col-form-label float-sm-left col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.template.domain.label'); ?></legend>
         <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_sympaDomain',
                 array(
-                    'label' => false,
+                    'label' => true,
                     'class' => 'form-check-input',
                     'legend' => false,
                     'id' => 'gsh_input_sympaDomain',
@@ -89,17 +86,14 @@
                 )
             ); ?>
         </div>
-    </div>
-    <div class="form-group row py-2 bg-light sympa-option">
-        <?php echo $this->Form->label(false, "Is moderated?", array(
-            'for' => 'gsh_input_isSympaModerated',
-            'class' => "col-sm-3 col-form-label"
-        )); ?>
+    </fieldset>
+    <fieldset class="form-group row py-2 bg-light sympa-option">
+        <legend class="col-form-label float-sm-left col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.template.is-moderated.label'); ?></legend>
         <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isSympaModerated',
                 array(
-                    'label' => false,
+                    'label' => true,
                     'class' => 'form-check-input',
                     'legend' => false,
                     'id' => 'gsh_input_isSympaModerated',
@@ -115,17 +109,14 @@
                 )
             ); ?>
         </div>
-    </div>
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.is-optin.label'), array(
-            'for' => 'gsh_input_isOptin',
-            'class' => "col-sm-3 col-form-label"
-        )); ?>
+    </fieldset>
+    <fieldset class="form-group row py-2 bg-light">
+        <legend class="col-form-label float-sm-left col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.template.is-optin.label'); ?></legend>
         <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isOptin',
                 array(
-                    'label' => false,
+                    'label' => true,
                     'class' => 'form-check-input',
                     'legend' => false,
                     'id' => 'gsh_input_isOptin',
@@ -141,7 +132,7 @@
                 )
             ); ?>
         </div>
-    </div>
+    </fieldset>
     <!--<div class="form-group row py-2 bg-light">
         <?php /*echo $this->Form->label(false, "Days for Attestation", array(
             'for' => 'gsh_input_attestationDays',
@@ -159,16 +150,13 @@
             ));*/ ?>
         </div>
     </div>-->
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.add-wiki.label'), array(
-            'for' => 'gsh_input_isConfluence',
-            'class' => "col-sm-3 col-form-label"
-        )); ?>
+    <fieldset class="form-group row py-2 bg-light">
+        <legend class="col-form-label float-sm-left col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.template.add-wiki.label'); ?></legend>
         <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isConfluence',
                 array(
-                    'label' => false,
+                    'label' => true,
                     'class' => 'form-check-input',
                     'legend' => false,
                     'id' => 'gsh_input_isConfluence',
@@ -184,17 +172,14 @@
                 )
             ); ?>
         </div>
-    </div>
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.add-project.label'), array(
-            'for' => 'gsh_input_isJira',
-            'class' => "col-sm-3 col-form-label"
-        )); ?>
+    </fieldset>
+    <fieldset class="form-group row py-2 bg-light">
+        <legend class="col-form-label float-sm-left col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.template.add-project.label'); ?></legend>
         <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isJira',
                 array(
-                    'label' => false,
+                    'label' => true,
                     'class' => 'form-check-input',
                     'legend' => false,
                     'id' => 'gsh_input_isJira',
@@ -210,7 +195,7 @@
                 )
             ); ?>
         </div>
-    </div>
+    </fieldset>
     <div class="form-group row py-2 bg-lighter">
         <div class="col-sm-9 offset-sm-3">
             <?php echo $this->Form->button(_txt('pl.grouperlite.form.group.action.save'), array(