diff --git a/Lib/lang.php b/Lib/lang.php
index f4124d7..80f2baf 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -30,7 +30,7 @@
   'pl.grouperlite.title.emaillists-manage' => 'Email lists I manage',
   'pl.grouperlite.title.emaillistsinfo' => 'Email list configuration and attributes',
   'pl.grouperlite.title.groupcreate' => 'Create Group',
-  'pl.grouperlite.title.templatecreate' => 'Create Email List',
+  'pl.grouperlite.title.templatecreate' => 'Create a Templated Group',
 
   'pl.grouperlite.message.flash.join-group-success' => 'You have been added to the group!',
   'pl.grouperlite.message.flash.join-group-failed' => 'You are unable to join the group!',
@@ -52,6 +52,28 @@
   'pl.grouperlite.table.action'  => 'Action',
   'pl.grouperlite.table.open' => 'Access',
   'pl.grouperlite.table.groups' => 'Groups',
+  'pl.grouperlite.table.attribute-name' => 'Attribute name',
+  'pl.grouperlite.table.attribute-description' => 'Attribute description',
+
+  'pl.grouperlite.table.display-name' => 'Display Name:',
+  'pl.grouperlite.table.grouper-name' => 'Grouper Name:',
+  'pl.grouperlite.table.display-extension' => 'Display Extension:',
+  'pl.grouperlite.table.extension' => 'Extension:',
+  'pl.grouperlite.table.enabled' => 'Enabled:',
+  'pl.grouperlite.table.type-of-group' => 'Type of Group:',
+  'pl.grouperlite.table.uuid' => 'UUID:',
+
+  'pl.grouperlite.table.status-open' => 'Open',
+  'pl.grouperlite.table.status-moderated' => 'Moderated',
+  'pl.grouperlite.table.user-type-members' => 'Subscribers',
+  'pl.grouperlite.table.user-type-moderators' => 'Moderators',
+  'pl.grouperlite.table.user-type-owners' => 'Owners',
+
+  'pl.grouperlite.group.info.attributes-zero-state' => 'No attributes defined.',
+  'pl.grouperlite.group.info.attributes-heading' => 'Attributes',
+  'pl.grouperlite.group.info.properties-heading' => 'Properties',
+  'pl.grouperlite.group.info.page-heading' => 'Group:',
+  'pl.grouperlite.group.info.members-heading' => 'Members',
 
   'pl.grouperlite.value.descr.zerostate' => 'No Description',
   'pl.grouperlite.value.enabled' => 'Enabled',
@@ -65,6 +87,11 @@
   'pl.grouperlite.action.unsubscribe' => 'Unsubscribe',
   'pl.grouperlite.action.search' => 'Search',
   'pl.grouperlite.action.remove' => 'Remove',
+  'pl.grouperlite.action.view' => 'View',
+  'pl.grouperlite.action.edit' => 'Edit',
+  'pl.grouperlite.action.view-in-grouper' => 'View in Grouper',
+  'pl.grouperlite.action.view-members' => 'View members',
+  'pl.grouperlite.action.close' => 'Close',
 
   'pl.grouperlite.form.group.template.label' => 'Select a template',
   'pl.grouperlite.form.group.template.empty' => '(choose one)',
@@ -85,6 +112,19 @@
   'pl.grouperlite.form.group.subs.placeholder' => 'Search subscribers',
   'pl.grouperlite.form.group.action.save' => 'Save Group',
 
+  'pl.grouperlite.form.template.work-group-extension.label' => 'Working Group Extension',
+  'pl.grouperlite.form.template.work-group-disp-extension.label' => 'Working Group Display Extension',
+  'pl.grouperlite.form.template.work-group-description.label' => 'Working Group Description',
+  'pl.grouperlite.form.template.enable-email-list.label' => 'Enable email list?',
+  'pl.grouperlite.form.template.domain.label' => 'Domain:',
+  '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.add-wiki.label' => 'Add wiki?',
+  'pl.grouperlite.form.template.add-project.label' => 'Add project?',
+  'pl.grouperlite.form.template.value.positive' => 'Yes',
+  'pl.grouperlite.form.template.value.negative' => 'No',
+
   'pl.grouperlite.search.tags.text' => 'Search',
 
   'pl.grouperlite.pagination.counter' => 'Viewing {:start}-{:end} of {:count}'
diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
index dfb6978..e23f097 100644
--- a/View/Elements/Components/groupattributes.ctp
+++ b/View/Elements/Components/groupattributes.ctp
@@ -1,19 +1,19 @@
 <table class="table table-striped w-100">
     <thead>
         <tr>
-            <th class="attr">Attribute name</th>
-            <th class="attr definition">Attribute description</th>
-            <th class="attr action">Action</th>
+            <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 foreach ($attributes as $attr) : ?>
             <tr>
                 <td><?php echo $attr['displayName']; ?></td>
                 <td><?php echo $attr['description'] ?></td>
                 <td>
-                    <a href="<?php echo $baseUrl.$attr['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                        View <i class="fa fa-external-link"></i>
+                    <a href="<?php echo $baseUrl . $attr['uuid']; ?>" 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>
@@ -21,7 +21,7 @@
     </tbody>
 </table>
 <?php if (count($attr) < 1) : ?>
-<div class="alert alert-info">
-    <p class="lead mb-0 text-center">No attributes defined.</p>
-</div>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.attributes.zero-state'); ?></p>
+    </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/View/Elements/Components/groupproperties.ctp b/View/Elements/Components/groupproperties.ctp
index 7f78303..c21099a 100644
--- a/View/Elements/Components/groupproperties.ctp
+++ b/View/Elements/Components/groupproperties.ctp
@@ -1,41 +1,41 @@
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Display Name:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.display-name'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['displayName']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Grouper Name:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.grouper-name'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['name']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Display Extension:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.display-extension'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['displayExtension']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Extension:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.extension'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['extension']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Enabled:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.enabled'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['enabled']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Type of Group:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.type-of-group'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['typeOfGroup']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">UUID:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.uuid'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['uuid']; ?>
     </div>
diff --git a/View/Elements/Components/pagination.ctp b/View/Elements/Components/pagination.ctp
deleted file mode 100644
index 8515b18..0000000
--- a/View/Elements/Components/pagination.ctp
+++ /dev/null
@@ -1,14 +0,0 @@
-<nav className="paging px-4 py-2 d-flex justify-content-between align-items-center" aria-label="Page navigation example">
-    <div className="d-flex align-items-center">
-        Display 
-        <select className="custom-select custom-select-sm mx-2">
-            <option>25</option>
-            <option>100</option>
-        </select>
-        records
-        <button className="btn btn-grouper btn btn-light btn btn-sm ml-2">Go</button>
-    </div>
-    <div>
-        Page 1 of 1, Viewing 1-23 of 23
-    </div>
-</nav>
\ No newline at end of file
diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
index a338ef3..ca42a44 100644
--- a/View/Elements/Components/search.ctp
+++ b/View/Elements/Components/search.ctp
@@ -46,66 +46,4 @@
         });
     </script>
 </div>
-<!--
-    <div id class="my-2 collapse bg-light border-light py-3 px-4">
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-name">Display Name</label>
-                <input type="text" name="" class="form-control" id="adv-search-name" />
-            </div>
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-open">Open</label>
-                <select class="custom-select" id="adv-search-open">
-                    <option>Open</option>
-                    <option>Closed</option>
-                </select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-descr">Description</label>
-                <input type="text" class="form-control" id="adv-search-descr" />
-            </div>
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-auto">Automatic</label>
-                <select class="custom-select" id="adv-search-auto">
-                    <option>True</option>
-                    <option>False</option>
-                </select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-status">Status</label>
-                <select class="custom-select" id="adv-search-status">
-                    <option>All</option>
-                    <option>Active</option>
-                    <option>Inactive</option>
-                </select>
-            </div>
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-type">Type</label>
-                <select class="custom-select" id="adv-search-type">
-                    <option>All</option>
-                    <option>Other</option>
-                </select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-users">User</label>
-                <input type="text" name="" class="form-control" id="adv-search-users" />
-            </div>
-            <div class="col col-lg-6 col-12 d-flex justify-content-end align-items-end">
-                <button class="btn btn-grouper btn btn-primary btn btn-raised">Filter Groups</button>
-            </div>
-        </div>
-    </div>
-    <div class="d-flex justify-content-end align-items-end my-2">
-        <button class="btn btn-grouper btn btn-link adv-search-link">
-            <i class="fa fa-caret-down"></i>
-            &nbsp;advanced search
-        </button>
-    </div>
-    -->
 <?php echo $this->Form->end(); ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/emaillistinfo.ctp b/View/GrouperGroups/emaillistinfo.ctp
index c16600a..61f6e35 100644
--- a/View/GrouperGroups/emaillistinfo.ctp
+++ b/View/GrouperGroups/emaillistinfo.ctp
@@ -3,93 +3,68 @@
 $baseUrl = 'https://grouper.staging.at.internet2.edu/grouper/';
 $path = 'grouperUi/app/UiV2Main.index';
 $groupOperation = '?operation=UiV2Group.viewGroup&groupId=';
-$groupUrlBase = $baseUrl.$path.$groupOperation;
+$groupUrlBase = $baseUrl . $path . $groupOperation;
 $attrOperation = '?operation=UiV2AttributeDefName.viewAttributeDefName&attributeDefNameId=';
-$attrUrlBase = $baseUrl.$path.$attrOperation;
+$attrUrlBase = $baseUrl . $path . $attrOperation;
 ?>
 
 <div>
     <div class="border-bottom py-4 mb-4 d-flex justify-content-between">
-        <h2><strong>Group: </strong><?php echo $groupergroupsdetail['displayName']; ?></h2>
-        <div>
-            <a href="<?php echo $groupUrlBase.$groupergroupsdetail['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised" target="_blank" role="button">
-                View Group in Grouper &nbsp;
+        <h2><strong><?php echo _txt('pl.grouperlite.group.info.page-heading'); ?></strong> <?php echo $groupergroupsdetail['displayName']; ?></h2>
+        <div class="d-flex align-items-center">
+            <?php if ($isuserowner === 'T') : ?>
+                <button class="btn btn-grouper btn btn-primary mr-2" data-toggle="modal" data-target="#subscribers"><?php echo _txt('pl.grouperlite.action.view-members'); ?> <i class="fa fa-group"></i></button>
+            <?php endif ?>
+            <a href="<?php echo $groupUrlBase . $groupergroupsdetail['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised" target="_blank" role="button">
+                <?php echo _txt('pl.grouperlite.action.view-in-grouper'); ?> &nbsp;
                 <i class="fa fa-external-link"></i>
             </a>
         </div>
     </div>
     <div class="row">
         <div class="col-xl-6 col-xs-12 group-details">
-            <h3>Group Properties</h3>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Display Name:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['displayName']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-light">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Grouper Name:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['name']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Display Extension:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['displayExtension']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-light">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Extension:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['extension']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="name" class="col-sm-3 col-form-label font-weight-bold">Enabled:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['enabled']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-light">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Type of Group:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['typeOfGroup']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="name" class="col-sm-3 col-form-label font-weight-bold">UUID:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['uuid']; ?>
-                </div>
+            <div class="d-flex align-items-center mb-3">
+                <h3 class="mb-1"><?php echo _txt('pl.grouperlite.group.info.properties-heading'); ?></h3>
+                <?php if ($isuserowner === 'T') : ?>
+                    <button class="btn btn-grouper btn btn-primary btn btn-sm ml-4">
+                        <?php echo _txt('pl.grouperlite.action.edit'); ?>
+                        <i class="fa fa-pencil fa-sm"></i>
+                    </button>
+                <?php endif; ?>
             </div>
+            <?php echo $this->element('Components/groupproperties', array(
+                'group' => $groupergroupsdetail
+            )); ?>
         </div>
         <div class="col-xl-6 col-xs-12">
             <div class="table-responsive">
-                <h3>Attributes</h3>
-                <table class="table table-striped w-100">
-                    <thead>
-                        <tr>
-                            <th class="attr descr">Attribute name</th>
-                            <th class="attr definition">Attribute description</th>
-                            <th class="attr action">Action</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <?php foreach ($groupergroupsdetail['attributes'] as $attr): ?>
-                            <tr>
-                                <td><a href="/"><?php echo $attr['displayName']; ?></a></td>
-                                <td><?php echo $attr['description'] ?></td>
-                                <td>
-                                    <a href="<?php echo $attrUrlBase.$attr['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                                        View <i class="fa fa-external-link"></i>
-                                    </a>
-                                </td>
-                            </tr>
-                        <?php endforeach; ?>
-                    </tbody>
-                </table>
+                <h3><?php echo _txt('pl.grouperlite.group.info.attributes-heading'); ?></h3>
+                <?php echo $this->element('Components/groupattributes', array(
+                    'attributes' => $groupergroupsdetail['attributes'],
+                    'baseUrl' => $attrUrlBase
+                )); ?>
             </div>
         </div>
     </div>
 </div>
+
+<?php if ($isuserowner === 'T') : ?>
+    <div class="modal modal-primary fade" tabindex="-1" id="subscribers">
+        <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>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <?php echo $this->element('Components/subscriberList', array('subscribers' => $groupergroupssubscribers)); ?>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal"><?php echo ('pl.grouperlite.action.close'); ?></button>
+                </div>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/emaillistsmanage.ctp b/View/GrouperGroups/emaillistsmanage.ctp
index 04349b3..3c3c41c 100644
--- a/View/GrouperGroups/emaillistsmanage.ctp
+++ b/View/GrouperGroups/emaillistsmanage.ctp
@@ -16,27 +16,27 @@
         <tbody>
             <tr>
                 <td><?php echo $this->Html->link(
-                        isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name",
+                        isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "--",
                         array(
                             'controller' => 'groupergroups',
                             'action' => 'emaillistinfo',
                             '?' => array('groupname' => urlencode($group['name']))
                         )
                     ) ?></td>
-                <td><?php echo isset($group['description']) ? $group['description'] : "No Description"; ?></td>
+                <td><?php echo isset($group['description']) ? $group['description'] : "--"; ?></td>
                 <td>
-                    <a href="#">Subscribers (10)</a> |
-                    <a href="#">Moderators (2)</a> |
-                    <a href="#">Owners (1)</a>
+                    <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' ? 'Open' : 'Moderated'; ?></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-between align-items-center">
-                        <button class="btn btn-grouper btn btn-raised btn btn-primary w-50 mr-1">
+                    <span class="d-flex flex-column flex-lg-row justify-content-center align-items-center">
+                        <?php /*<button class="btn btn-grouper btn btn-raised btn btn-primary w-50 mr-1">
                             <?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 w-50 ml-1">
+                        </button>*/ ?>
+                        <button class="btn btn-grouper btn btn-raised btn btn-danger ml-1 flex-fill">
                             <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
                             <i class="fa fa-ban fa-sm"></i>
                         </button>
diff --git a/View/GrouperGroups/groupcreatetemplate.ctp b/View/GrouperGroups/groupcreatetemplate.ctp
index 32803a3..a0b2e9c 100644
--- a/View/GrouperGroups/groupcreatetemplate.ctp
+++ b/View/GrouperGroups/groupcreatetemplate.ctp
@@ -1,6 +1,6 @@
 <?php
 $this->extend('/GrouperGroups/base');
-$this->Html->addCrumb('Create a Template Group');
+$this->Html->addCrumb('Create a Templated Group');
 
 $model = $this->name;
 ?>
diff --git a/View/GrouperGroups/groupfields.inc b/View/GrouperGroups/groupfields.inc
index 72e6171..ceb7111 100644
--- a/View/GrouperGroups/groupfields.inc
+++ b/View/GrouperGroups/groupfields.inc
@@ -107,7 +107,7 @@ $PRIVILEGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
         )); */ ?>
     </div>
 </div>-->
-<fieldset id="form" class="">
+<fieldset id="form" class="container-fluid">
     <div class="form-group row py-2 bg-light">
         <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.group.name.label'), array(
             'for' => 'name',
@@ -156,12 +156,12 @@ $PRIVILEGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
                 'rows' => 5
             )); ?>
             <small id="descrHelp" class="form-text text-muted">
-                Description contains notes about the group, which could include: what the group represents, why it was created, etc.
+                <?php echo _txt('pl.grouperlite.form.group.description.help'); ?>
             </small>
         </div>
     </div>
     <div class="form-group row py-2 bg-lighter">
-        <legend class="col-form-label col-sm-3 pt-0">Privileges:</legend>
+        <legend class="col-form-label col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.group.privs.label'); ?>:</legend>
         <div class="col-sm-9">
             <div class="d-flex">
                 <?php foreach ($PRIVILEGES as $opt) : ?>
diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp
index bfc04f8..80b8ae8 100644
--- a/View/GrouperGroups/groupinfo.ctp
+++ b/View/GrouperGroups/groupinfo.ctp
@@ -11,13 +11,13 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
 
 <div>
     <div class="border-bottom py-4 mb-4 d-flex justify-content-between">
-        <h2><strong>Group: </strong><?php echo $groupergroupsdetail['friendlyName']; ?></h2>
+        <h2><strong><?php echo _txt('pl.grouperlite.group.info.page-heading'); ?></strong> <?php echo $groupergroupsdetail['friendlyName']; ?></h2>
         <div class="d-flex align-items-center">
             <?php if ($isuserowner === 'T') : ?>
-                <button class="btn btn-grouper btn btn-primary mr-2" data-toggle="modal" data-target="#subscribers">View Subscribers <i class="fa fa-group"></i></button>
+                <button class="btn btn-grouper btn btn-primary mr-2" data-toggle="modal" data-target="#subscribers"><?php echo _txt('pl.grouperlite.action.view-members'); ?> <i class="fa fa-group"></i></button>
             <?php endif ?>
             <a href="<?php echo $groupUrlBase . $groupergroupsdetail['uuid']; ?>" class="btn btn-grouper btn btn-success mt-0" target="_blank" role="button">
-                View in Grouper &nbsp;
+                <?php echo _txt('pl.grouperlite.action.view-in-grouper'); ?> &nbsp;
                 <i class="fa fa-external-link"></i>
             </a>
         </div>
@@ -25,24 +25,21 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
     <div class="row">
         <div class="col-xl-6 col-xs-12 group-details mb-4">
             <div class="d-flex align-items-center mb-3">
-                <h3 class="mb-1">Group Properties</h3>
-                <?php if ($isuserowner === 'T') : ?>
+                <h3 class="mb-1"><?php echo _txt('pl.grouperlite.group.info.properties-heading'); ?></h3>
+                <?php /* if ($isuserowner === 'T') : ?>
                     <button class="btn btn-grouper btn btn-primary btn btn-sm ml-4">
-                        Edit Group
+                        <?php echo _txt('pl.grouperlite.action.edit'); ?>
                         <i class="fa fa-pencil fa-sm"></i>
                     </button>
-                <?php endif; ?>
+                <?php endif; */ ?>
             </div>
-
-
             <?php echo $this->element('Components/groupproperties', array(
                 'group' => $groupergroupsdetail
             )); ?>
-
         </div>
         <div class="col-xl-6 col-xs-12">
             <div class="table-responsive">
-                <h3>Attributes</h3>
+                <h3><?php echo _txt('pl.grouperlite.group.info.attributes-heading'); ?></h3>
                 <?php echo $this->element('Components/groupattributes', array(
                     'attributes' => $groupergroupsdetail['attributes'],
                     'baseUrl' => $attrUrlBase
@@ -57,7 +54,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
         <div class="modal-dialog modal-dialog-scrollable">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Subscribers</h5>
+                    <h5 class="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>
@@ -66,7 +63,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
                     <?php echo $this->element('Components/subscriberList', array('subscribers' => $groupergroupssubscribers)); ?>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal"><?php echo ('pl.grouperlite.action.close'); ?></button>
                 </div>
             </div>
         </div>
diff --git a/View/GrouperGroups/groupuser.ctp b/View/GrouperGroups/groupuser.ctp
deleted file mode 100644
index 3e12d65..0000000
--- a/View/GrouperGroups/groupuser.ctp
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php $this->extend('/GrouperGroups/base'); ?>
-<?php echo $this->element('Components/navigation', array('active' => 'groupoptin')); ?>
-<?php echo $this->element('Components/search'); ?>
-<div class="">
-    <table class="table table-striped w-100">
-        <thead>
-            <tr>
-                <th class="group name">Name</th>
-                <th class="group descr">Description</th>
-                <th class="group status">Status</th>
-                <th class="group action">Action</th>
-            </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($groupergroupoptin as $group): ?>
-            <tr>
-                <td><?php echo $this->Html->link(
-                    isset($group['name']) ? $group['name'] : "No Name",
-                    array(
-                        'controller' => 'groupergroups',
-                        'action' => 'groupinfo',
-                        '?' => array('groupname' => urlencode($group['name']))
-                    )
-                ) ?></td>
-                <td><?php echo isset($group['description']) ? $group['description'] : "No Description"; ?></td>
-                <td><?php echo isset($group['member']) ? $group['member'] : "False"; ?></td>
-                <td>
-                    <?php echo $this->element('Components/optAction', array(
-                        'member' => $group['member'],
-                        'action' => $group['member'] ? 'leavegroup' : 'joingroup',
-                        'group' => $group['name']
-                    )); ?>
-                </td>
-            </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
diff --git a/View/GrouperGroups/joingroup.ctp b/View/GrouperGroups/joingroup.ctp
index 1e76b45..e4d9672 100644
--- a/View/GrouperGroups/joingroup.ctp
+++ b/View/GrouperGroups/joingroup.ctp
@@ -1,2 +1,2 @@
-<?php echo 'joined group - '.$groupname; ?>
+<?php echo _txt('joined group').' - '.$groupname; ?>
 <?php echo $groupergroupjoined; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/leavegroup.ctp b/View/GrouperGroups/leavegroup.ctp
index 611c716..2a3df51 100644
--- a/View/GrouperGroups/leavegroup.ctp
+++ b/View/GrouperGroups/leavegroup.ctp
@@ -1,2 +1,2 @@
-<?php echo 'left group - '.$groupname; ?>
+<?php echo _txt('left group').' - '.$groupname; ?>
 <?php echo $groupergroupleft; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/templatefields.inc b/View/GrouperGroups/templatefields.inc
index f5b9524..47b7d85 100644
--- a/View/GrouperGroups/templatefields.inc
+++ b/View/GrouperGroups/templatefields.inc
@@ -1,6 +1,6 @@
-<fieldset id="form" class="">
+<fieldset id="form" class="container-fluid">
     <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Working Group Extension", array(
+        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.work-group-extension.label'), array(
             'for' => 'gsh_input_workingGroupExtension',
             'class' => "col-sm-3 col-form-label"
         )); ?>
@@ -15,7 +15,7 @@
         </div>
     </div>
     <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Working Group Display Extension", array(
+        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.work-group-disp-extension.label'), array(
             'for' => 'gsh_input_workingGroupDisplayExtension',
             'class' => "col-sm-3 col-form-label"
         )); ?>
@@ -29,7 +29,7 @@
         </div>
     </div>
     <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Working Group Description", array(
+        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.work-group-description.label'), array(
             'for' => 'gsh_input_workingGroupDescription',
             'class' => "col-sm-3 col-form-label"
         )); ?>
@@ -43,11 +43,11 @@
         </div>
     </div>
     <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Enable Sympa for Group?", array(
+        <?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"
         )); ?>
-        <div class="col-sm-9">
+        <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isSympa',
                 array(
@@ -59,8 +59,8 @@
                     'separator' => '</div><div class="form-check form-check-inline">',
                     'after' => '</div>',
                     'options' => array(
-                        true => 'Yes',
-                        false => 'No'
+                        true => _txt('pl.grouperlite.form.template.value.positive'),
+                        false => _txt('pl.grouperlite.form.template.value.negative')
                     ),
                     'type' => 'radio',
                     'default' => true
@@ -69,8 +69,8 @@
         </div>
     </div>
     <div class="form-group row py-2 bg-light sympa-option">
-        <legend class="col-form-label col-sm-3 pt-0">Sympa Domain:</legend>
-        <div class="col-sm-9">
+        <legend class="col-form-label 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(
@@ -82,8 +82,8 @@
                     'separator' => '</div><div class="form-check form-check-inline">',
                     'after' => '</div>',
                     'options' => array(
-                        'internet2' => 'Internet2',
-                        'incommon' => 'Incommon'
+                        'internet2' => _txt('pl.grouperlite.form.template.value.internet2'),
+                        'incommon' => _txt('pl.grouperlite.form.template.value.incommon')
                     ),
                     'type' => 'radio'
                 )
@@ -91,11 +91,11 @@
         </div>
     </div>
     <div class="form-group row py-2 bg-light sympa-option">
-        <?php echo $this->Form->label(false, "Is Sympa Moderated?", array(
+        <?php echo $this->Form->label(false, "Is moderated?", array(
             'for' => 'gsh_input_isSympaModerated',
             'class' => "col-sm-3 col-form-label"
         )); ?>
-        <div class="col-sm-9">
+        <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isSympaModerated',
                 array(
@@ -107,8 +107,8 @@
                     'separator' => '</div><div class="form-check form-check-inline">',
                     'after' => '</div>',
                     'options' => array(
-                        true => 'Yes',
-                        false => 'No'
+                        true => _txt('pl.grouperlite.form.template.value.positive'),
+                        false => _txt('pl.grouperlite.form.template.value.negative')
                     ),
                     'type' => 'radio',
                     'default' => false
@@ -117,11 +117,11 @@
         </div>
     </div>
     <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Is Group Optin?", array(
+        <?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"
         )); ?>
-        <div class="col-sm-9">
+        <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isOptin',
                 array(
@@ -133,8 +133,8 @@
                     'separator' => '</div><div class="form-check form-check-inline">',
                     'after' => '</div>',
                     'options' => array(
-                        true => 'Yes',
-                        false => 'No'
+                        true => _txt('pl.grouperlite.form.template.value.positive'),
+                        false => _txt('pl.grouperlite.form.template.value.negative')
                     ),
                     'type' => 'radio',
                     'default' => false
@@ -142,13 +142,13 @@
             ); ?>
         </div>
     </div>
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Days for Attestation", array(
+    <!--<div class="form-group row py-2 bg-light">
+        <?php /*echo $this->Form->label(false, "Days for Attestation", array(
             'for' => 'gsh_input_attestationDays',
             'class' => "col-sm-3 col-form-label"
-        )); ?>
+        ));*/ ?>
         <div class="col-sm-9">
-            <?php echo $this->Form->input('gsh_input_attestationDays', array(
+            <?php /*echo $this->Form->input('gsh_input_attestationDays', array(
                 'label' => false,
                 'class' => 'form-control',
                 'type' => 'number',
@@ -156,15 +156,15 @@
                 'min' => '30',
                 'max' => '365',
                 'id' => 'gsh_input_attestationDays'
-            )); ?>
+            ));*/ ?>
         </div>
-    </div>
+    </div>-->
     <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Add Confluence?", array(
+        <?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"
         )); ?>
-        <div class="col-sm-9">
+        <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isConfluence',
                 array(
@@ -176,8 +176,8 @@
                     'separator' => '</div><div class="form-check form-check-inline">',
                     'after' => '</div>',
                     'options' => array(
-                        true => 'Yes',
-                        false => 'No'
+                        true => _txt('pl.grouperlite.form.template.value.positive'),
+                        false => _txt('pl.grouperlite.form.template.value.negative')
                     ),
                     'type' => 'radio',
                     'default' => false
@@ -186,11 +186,11 @@
         </div>
     </div>
     <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, "Add Jira?", array(
+        <?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"
         )); ?>
-        <div class="col-sm-9">
+        <div class="col-sm-9 d-flex align-items-center">
             <?php echo $this->Form->input(
                 'gsh_input_isJira',
                 array(
@@ -202,8 +202,8 @@
                     'separator' => '</div><div class="form-check form-check-inline">',
                     'after' => '</div>',
                     'options' => array(
-                        true => 'Yes',
-                        false => 'No'
+                        true => _txt('pl.grouperlite.form.template.value.positive'),
+                        false => _txt('pl.grouperlite.form.template.value.negative')
                     ),
                     'type' => 'radio',
                     'default' => false