diff --git a/app/resources/locales/en_US/field.po b/app/resources/locales/en_US/field.po
index 26521adc4..f85e23fe1 100644
--- a/app/resources/locales/en_US/field.po
+++ b/app/resources/locales/en_US/field.po
@@ -68,6 +68,9 @@ msgstr "Revision"
 msgid "children"
 msgstr "Children"
 
+msgid "cloning"
+msgstr "Cloning"
+
 msgid "code"
 msgstr "Code"
 
diff --git a/app/templates/ApiUsers/fields.inc b/app/templates/ApiUsers/fields.inc
index edab51f89..9f35787d1 100644
--- a/app/templates/ApiUsers/fields.inc
+++ b/app/templates/ApiUsers/fields.inc
@@ -29,7 +29,6 @@ if($vv_cur_co->isCOmanageCO()) {
   $banners = [
     __d('information', 'api.cmp')
   ];
-  }
 }
 
 // We link to the "Generate" button on edit only
@@ -65,4 +64,4 @@ $fields = [
   'privileged', // boolean
 ];
 
-print $this->element('clonable');
\ No newline at end of file
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
\ No newline at end of file
diff --git a/app/templates/Cous/fields.inc b/app/templates/Cous/fields.inc
index 54ba7210f..b8f3f1d0f 100644
--- a/app/templates/Cous/fields.inc
+++ b/app/templates/Cous/fields.inc
@@ -36,4 +36,4 @@ if(!empty($parents)) {
   ];
 }
 
-print $this->element('clonable');
\ No newline at end of file
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
\ No newline at end of file
diff --git a/app/templates/ExternalIdentitySources/fields.inc b/app/templates/ExternalIdentitySources/fields.inc
index 4a9e5b28f..75a0d81ec 100644
--- a/app/templates/ExternalIdentitySources/fields.inc
+++ b/app/templates/ExternalIdentitySources/fields.inc
@@ -37,7 +37,7 @@ $fields = [
   'suppress_noop_logs'
 ];
 
-print $this->element('clonable');      
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));      
       
 // Top Links
 $topLinks = [
diff --git a/app/templates/Groups/fields.inc b/app/templates/Groups/fields.inc
index 170b82d45..8d50d9d1f 100644
--- a/app/templates/Groups/fields.inc
+++ b/app/templates/Groups/fields.inc
@@ -72,7 +72,7 @@ if($vv_action != 'add') {
   }
 }
 
-print $this->element('clonable');
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
 
 // List the MVEAs that may be shown on the mveaCanvas
 // When this array exists, the mveaCanvas.php element will render  
diff --git a/app/templates/IdentifierAssignments/fields.inc b/app/templates/IdentifierAssignments/fields.inc
index ed4f3d0b4..ff57d2106 100644
--- a/app/templates/IdentifierAssignments/fields.inc
+++ b/app/templates/IdentifierAssignments/fields.inc
@@ -38,7 +38,7 @@ $fields = [
   'ordr'
 ];
 
-print $this->element('clonable');
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
 ?>
 
 <script>
diff --git a/app/templates/Pipelines/fields.inc b/app/templates/Pipelines/fields.inc
index 8a77ed04f..5d30fa07a 100644
--- a/app/templates/Pipelines/fields.inc
+++ b/app/templates/Pipelines/fields.inc
@@ -43,7 +43,7 @@ $fields = [
   // XXX Connections
 ];
 
-print $this->element('clonable');
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
 
 // Top Links
 $topLinks[] = [
diff --git a/app/templates/ProvisioningTargets/fields.inc b/app/templates/ProvisioningTargets/fields.inc
index eac90964e..ebe1a9d12 100644
--- a/app/templates/ProvisioningTargets/fields.inc
+++ b/app/templates/ProvisioningTargets/fields.inc
@@ -39,7 +39,7 @@ $fields = [
   'ordr'
 ];
 
-print $this->element('clonable');
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
 
 $subnav = [
   'name' => 'plugin',
diff --git a/app/templates/Servers/fields.inc b/app/templates/Servers/fields.inc
index f17900223..317b70399 100644
--- a/app/templates/Servers/fields.inc
+++ b/app/templates/Servers/fields.inc
@@ -33,4 +33,4 @@ $fields = [
   ]
 ];
 
-print $this->element('clonable');
\ No newline at end of file
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
\ No newline at end of file
diff --git a/app/templates/element/clonable.php b/app/templates/Standard/clonable.inc
similarity index 70%
rename from app/templates/element/clonable.php
rename to app/templates/Standard/clonable.inc
index 157b84e77..661a54fe6 100644
--- a/app/templates/element/clonable.php
+++ b/app/templates/Standard/clonable.inc
@@ -25,12 +25,24 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-foreach(['uuid',
-         'cri',
-         'do_not_clone'] as $field) {
-  print $this->element('form/listItem', [
-    'arguments' => [
-      'fieldName' => $field
+return [
+  'clonable' => [
+    'fieldLabel' => __d('field','cloning'),
+    'labelIsTextOnly' => true, 
+    'groupedControls' =>  [
+      'uuid' => [
+        'singleRowItem' => true,
+        'label' => __d('field','uuid'),
+        'type' => 'text'
+      ],
+      'cri' => [
+        'singleRowItem' => true,
+        'label' => __d('field','cri')
+      ],
+      'do_not_clone' => [
+        'singleRowItem' => true,
+        'label' => __d('field','do_not_clone')
+      ]
     ]
-  ]);
-}
+  ]
+];
diff --git a/app/templates/Types/fields.inc b/app/templates/Types/fields.inc
index e527e3525..bde905091 100644
--- a/app/templates/Types/fields.inc
+++ b/app/templates/Types/fields.inc
@@ -36,7 +36,7 @@ $fields = [
   'edupersonaffiliation'
 ];
 
-print $this->element('clonable');
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/clonable.inc'));
 ?>
 
 <script>
diff --git a/app/templates/element/form/infoDiv/grouped.php b/app/templates/element/form/infoDiv/grouped.php
index 3c6af43c6..5433a76fa 100644
--- a/app/templates/element/form/infoDiv/grouped.php
+++ b/app/templates/element/form/infoDiv/grouped.php
@@ -25,11 +25,9 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-
 declare(strict_types = 1);
 
-$classes = '';
-
+$blockClass = '';
 
 ?>
 
@@ -39,12 +37,12 @@
   $fieldArguments = $this->Field->restructureFieldArguments($fieldArguments);
 
   if(isset($fieldArguments['singleRowItem']) && $fieldArguments['singleRowItem']) {
-    $classes .= 'd-block ';
+    $blockClass = ' d-block';
     // This configuration is not needed for the control construction
     unset($fieldArguments['singleRowItem']);
   }
   ?>
-  <div class="subfield subfield-cols <?= $classes ?>">
+  <div class="subfield subfield-cols<?= $blockClass ?>">
     <div class="field-col">
     <?= $this->Field->formField($fieldName, ...$fieldArguments) ?>
     </div>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 43c6ea1d1..e491f89aa 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -1584,6 +1584,12 @@ ul.form-list .subfield-title {
 ul.form-list .subfield-cols {
   display: inline-flex;
 }
+ul.form-list .subfield-cols.d-block {
+  margin-top: 0.5rem;
+}
+ul.form-list .subfield-cols.d-block:first-child {
+  margin-top: 0;
+}
 ul.form-list .field-col .subfield-title {
   display: block;
   margin-bottom: 0;