diff --git a/View/Elements/Components/navigation-groups.ctp b/View/Elements/Components/navigation-groups.ctp
index aadcef4..ff546ac 100644
--- a/View/Elements/Components/navigation-groups.ctp
+++ b/View/Elements/Components/navigation-groups.ctp
@@ -46,27 +46,28 @@
                     'action' => 'groupcreate'
                 )
             );
+            $createGroupUrl = '#';
             ?>
-            <a href="<?php echo $createGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
+            <a href="<?php echo $createGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2 text-muted" disabled>
                 <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-group'); ?>
             </a>
         </div>
     <?php } ?>
-  <?php if ($isuserowner === 'T') { ?>
-      <div class="align-self-center">
-        <?php
-        $createTemplateGroupUrl = $this->Html->url(
-          array(
-            'controller' => 'grouper_groups',
-            'action' => 'groupcreatetemplate'
-          )
-        );
-        ?>
-          <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 } ?>
+    <?php if ($isuserowner === 'T') { ?>
+        <div class="align-self-center">
+            <?php
+            $createTemplateGroupUrl = $this->Html->url(
+                array(
+                    'controller' => 'grouper_groups',
+                    'action' => 'groupcreatetemplate'
+                )
+            );
+            ?>
+            <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 } ?>
     <div class="align-self-center ml-auto">
         <?php
         $gotoEmailListsUrl = $this->Html->url(
diff --git a/View/Elements/base-styles.ctp b/View/Elements/base-styles.ctp
index 694c648..d000702 100644
--- a/View/Elements/base-styles.ctp
+++ b/View/Elements/base-styles.ctp
@@ -20,7 +20,7 @@
         max-width: 220px;
     }
 
-    .grouper .btn:hover {
+    .grouper .btn:not([disabled]):hover {
         text-decoration: none !important;
         filter: brightness(1.1);
     }
diff --git a/View/GrouperGroups/emaillistsmanage.ctp b/View/GrouperGroups/emaillistsmanage.ctp
index cf9b0fe..7080913 100644
--- a/View/GrouperGroups/emaillistsmanage.ctp
+++ b/View/GrouperGroups/emaillistsmanage.ctp
@@ -32,11 +32,11 @@
                 <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">
-                        <?php /*<button class="btn btn-grouper btn btn-raised btn btn-primary w-50 mr-1">
+                        <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">
+                        </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>
diff --git a/View/GrouperGroups/groupcreatetemplate.ctp b/View/GrouperGroups/groupcreatetemplate.ctp
index a30930d..d465236 100644
--- a/View/GrouperGroups/groupcreatetemplate.ctp
+++ b/View/GrouperGroups/groupcreatetemplate.ctp
@@ -7,7 +7,7 @@ $model = $this->name;
 <hr />
 <div class="mt-4">
     <div class="row">
-        <div class="col-lg-9 col-xs-12 col-xl-6">
+        <div class="col-lg-9 col-xs-12 col-xl-8">
             <div class="create-group">
                 <?php echo $this->Form->create(false, array(
                     'url' => array('controller' => 'grouper_groups', 'action' => 'groupcreatetemplate')
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 0e1baa1..b4a1cae 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -33,11 +33,11 @@
                     <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">
+                            <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">
+                            <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>
diff --git a/View/GrouperGroups/templatefields.inc b/View/GrouperGroups/templatefields.inc
index c01d6f0..5b4d338 100644
--- a/View/GrouperGroups/templatefields.inc
+++ b/View/GrouperGroups/templatefields.inc
@@ -2,7 +2,7 @@
     <div class="form-group row py-2 bg-light">
         <?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"
+            'class' => "col-sm-3 col-form-label d-flex align-items-center"
         )); ?>
         <div class="col-sm-9">
             <?php echo $this->Form->input('gsh_input_workingGroupExtension', array(
@@ -17,7 +17,7 @@
     <div class="form-group row py-2 bg-light">
         <?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"
+            'class' => "col-sm-3 col-form-label d-flex align-items-center"
         )); ?>
         <div class="col-sm-9">
             <?php echo $this->Form->input('gsh_input_workingGroupDisplayExtension', array(
@@ -31,7 +31,7 @@
     <div class="form-group row py-2 bg-light">
         <?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"
+            'class' => "col-sm-3 col-form-label d-flex align-items-center"
         )); ?>
         <div class="col-sm-9">
             <?php echo $this->Form->input('gsh_input_workingGroupDescription', array(
@@ -43,7 +43,7 @@
         </div>
     </div>
     <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>
+        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?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',
@@ -52,7 +52,7 @@
                     'class' => 'form-check-input',
                     'legend' => false,
                     'id' => 'gsh_input_isSympa',
-                    'before' => '<div class="form-check form-check-inline">',
+                    'before' => '<div class="form-check form-check-inline align-items-center">',
                     'separator' => '</div><div class="form-check form-check-inline">',
                     'after' => '</div>',
                     'options' => array(
@@ -66,7 +66,7 @@
         </div>
     </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>
+        <legend class="col-form-label float-sm-left col-sm-3 py-0 pl-4 d-flex align-items-center"><?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',
@@ -88,7 +88,7 @@
         </div>
     </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>
+        <legend class="col-form-label float-sm-left col-sm-3 py-0 pl-4 d-flex align-items-center"><?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',
@@ -111,7 +111,7 @@
         </div>
     </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>
+        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?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',
@@ -151,7 +151,7 @@
         </div>
     </div>-->
     <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>
+        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?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',
@@ -174,7 +174,7 @@
         </div>
     </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>
+        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?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',
diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css
index 9f12e4a..a8aad4d 100644
--- a/webroot/css/co-grouper-plugin.css
+++ b/webroot/css/co-grouper-plugin.css
@@ -20,7 +20,7 @@ a {
     color: var(--primary);
 }
 
-#grouper-plugin .btn.btn-primary:hover {
+#grouper-plugin .btn.btn-primary:not([disabled]):hover {
     background-color: black;
     border-color: black;
 }
@@ -272,4 +272,8 @@ a.list-group-item-action:hover .fa {
 
 .grouper .pagination .muted {
     color: rgba(255, 255, 255, 0.8);
+}
+
+.radio .form-check-inline label {
+    margin-bottom: 0;
 }
\ No newline at end of file