diff --git a/src/skin/js/group/GroupEditor.js b/src/skin/js/group/GroupEditor.js
index f9700f9a3..5411c12d2 100644
--- a/src/skin/js/group/GroupEditor.js
+++ b/src/skin/js/group/GroupEditor.js
@@ -1,5 +1,5 @@
 $(function() {
-    $(".groupSpecificProperties").on('click',(function (e) {
+    $(".groupSpecificProperties").on('click',function (e) {
         var groupPropertyAction = e.currentTarget.id;
         if (groupPropertyAction == "enableGroupProps") {
             $("#groupSpecificPropertiesModal").modal("show");
diff --git a/src/v2/templates/group/groupPropsEditor.php b/src/v2/templates/group/groupPropsEditor.php
index 6004bee88..825d897de 100644
--- a/src/v2/templates/group/groupPropsEditor.php
+++ b/src/v2/templates/group/groupPropsEditor.php
@@ -134,7 +134,11 @@
                   $sSQL = "UPDATE groupprop_".$iGroupID."
                     SET `".$aPropFields[$iPropID]."` = null
                     WHERE `per_ID` = '".$iPersonID."';";
-               }              
+               } else {
+                $sSQL = "UPDATE groupprop_".$iGroupID."
+                  SET `".$aPropFields[$iPropID]."` = '".$aDescFields[$iPropID]."'
+                  WHERE `per_ID` = '".$iPersonID."';";
+               }           
             } else {
               if ($aTypeFields[$iPropID] == 2) {
                  $aDescFields[$iPropID] = InputUtils::FilterDate($aDescFields[$iPropID]);
@@ -268,31 +272,24 @@
 
     </tr>
   <?php
-    } ?>
-
-    <tr>
-      <td colspan="7">
-      <table width="100%">
-        <tr>
-          <td width="10%"></td>
-          <td width="40%" align="center" valign="bottom">
-            <a href="<?= $sRootPath ?>/v2/people/person/view/<?= $iPersonID ?>/Group" class="btn btn-default"><?= _("Return to Person") ?></a>
-          </td>
-          <td width="40%" align="center" valign="bottom">
-            <input type="submit" class="btn btn-primary" value="<?= _('Save Changes') ?>" Name="SaveChanges">
-          </td>
-          <td width="10%"></td>
-        </tr>
-      </table>
-      </td>
-      <td>
-    </tr>
+    } ?>    
 <?php
     }
 ?>
    </table>
 </div>
 </center>
+<div class="card-footer">
+  <div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-2">
+      <a href="<?= $sRootPath ?>/v2/people/person/view/<?= $iPersonID ?>/Group" class="btn btn-default"><i class="fa-solid fa-backward"></i> <?= _("Return to Person") ?></a>
+    </div>
+    <div class="col-md-2">
+      <input type="submit" class="btn btn-primary" value="✓ <?= _('Save Changes') ?>" Name="SaveChanges">
+    </div>
+  </div>
+</div>
 </div>
 </form>
 
diff --git a/src/v2/templates/group/groupPropsFormEditor.php b/src/v2/templates/group/groupPropsFormEditor.php
index 0eb8bab20..430a59185 100644
--- a/src/v2/templates/group/groupPropsFormEditor.php
+++ b/src/v2/templates/group/groupPropsFormEditor.php
@@ -401,30 +401,23 @@
       </td>
     </tr>
   <?php
-    } ?>
-
-    <tr>
-      <td colspan="7">
-      <table width="100%">
-        <tr>
-          <td width="10%"></td>
-          <td width="40%" align="center" valign="bottom">
-            <a href="<?= $sRootPath ?>/v2/group/<?= $iGroupID ?>/view" class="btn btn-default"><i class="fa-solid fa-backward"></i> <?= _("Return to Group") ?></a>
-          </td>
-          <td width="40%" align="center" valign="bottom">
-            <input type="submit" class="btn btn-primary" value="&check; <?= _('Save Changes') ?>" Name="SaveChanges">
-          </td>
-          <td width="10%"></td>
-        </tr>
-      </table>
-      </td>
-      <td>
-    </tr>
+    } ?>    
 <?php
     }
 ?>
    </table>
 </div>
+<div class="card-footer">
+  <div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-2">
+      <a href="<?= $sRootPath ?>/v2/group/<?= $iGroupID ?>/view" class="btn btn-default"><i class="fa-solid fa-backward"></i> <?= _("Return to Group") ?></a>
+    </div>
+    <div class="col-md-2">
+      <input type="submit" class="btn btn-primary" value="&check; <?= _('Save Changes') ?>" Name="SaveChanges">
+    </div>
+  </div>
+</div>
 </center>
 </div>
 <div class="card">