diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php
index 413925c56b8d..7f8dc4f1ce86 100644
--- a/administrator/components/com_content/tmpl/article/edit.php
+++ b/administrator/components/com_content/tmpl/article/edit.php
@@ -153,7 +153,7 @@
 			<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'editor', Text::_('COM_CONTENT_SLIDER_EDITOR_CONFIG')); ?>
 			<fieldset id="fieldset-editor" class="options-form">
 				<legend><?php echo Text::_('COM_CONTENT_SLIDER_EDITOR_CONFIG'); ?></legend>
-				<div class="column-count-md-2 column-count-lg-3">
+				<div class="form-grid">
 				<?php echo $this->form->renderFieldset('editorConfig'); ?>
 				</div>
 			</fieldset>
diff --git a/administrator/components/com_messages/tmpl/config/default.php b/administrator/components/com_messages/tmpl/config/default.php
index 12cb54ba3909..e3b69c47a0ed 100644
--- a/administrator/components/com_messages/tmpl/config/default.php
+++ b/administrator/components/com_messages/tmpl/config/default.php
@@ -17,7 +17,7 @@
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_messages&view=config'); ?>" method="post" name="adminForm" id="message-form" class="form-validate">
-	<div class="col-lg-8 col-xl-6">
+	<div class="form-grid">
 		<div class="card">
 			<div class="card-body">
 				<?php echo $this->form->renderField('lock'); ?>
diff --git a/administrator/components/com_users/tmpl/group/edit.php b/administrator/components/com_users/tmpl/group/edit.php
index 80fdb098b7a6..2ba9412f9af5 100644
--- a/administrator/components/com_users/tmpl/group/edit.php
+++ b/administrator/components/com_users/tmpl/group/edit.php
@@ -26,7 +26,7 @@
 	<div class="card">
 		<div class="card-body">
 			<div class="row">
-				<div class="col-lg-8 col-xl-6">
+				<div class="form-grid">
 					<?php echo $this->form->renderField('title'); ?>
 					<?php echo $this->form->renderField('parent_id'); ?>
 				</div>
diff --git a/administrator/components/com_users/tmpl/note/edit.php b/administrator/components/com_users/tmpl/note/edit.php
index d95014f2a91d..beb668646c9c 100644
--- a/administrator/components/com_users/tmpl/note/edit.php
+++ b/administrator/components/com_users/tmpl/note/edit.php
@@ -24,7 +24,7 @@
 	<div class="card mt-4">
 		<div class="card-body">
 			<div class="row">
-				<div class="col-lg-8 col-xl-6">
+				<div class="form-grid">
 				<?php echo $this->form->renderField('subject'); ?>
 				<?php echo $this->form->renderField('user_id'); ?>
 				<?php echo $this->form->renderField('catid'); ?>
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php
index 87018a57e925..292bda9781ad 100644
--- a/administrator/components/com_users/tmpl/user/edit.php
+++ b/administrator/components/com_users/tmpl/user/edit.php
@@ -40,7 +40,7 @@
 			<div class="card">
 				<div class="card-body">
 					<div class="row">
-						<div class="col-lg-8 col-xl-6">
+						<div class="form-grid">
 						<?php echo $this->form->renderFieldset('user_details'); ?>
 						</div>
 					</div>
diff --git a/administrator/templates/atum/scss/blocks/_utilities.scss b/administrator/templates/atum/scss/blocks/_utilities.scss
index f1447e582e03..d66c9f054bc9 100644
--- a/administrator/templates/atum/scss/blocks/_utilities.scss
+++ b/administrator/templates/atum/scss/blocks/_utilities.scss
@@ -24,64 +24,115 @@
   display: table-row;
 }
 
-// Column Count
+// Form Grid
+
+.form-grid {
+  --span-1: span 1;
+  --span-2: span 1;
+  --span-3: span 1;
+  --span-4: span 1;
+  --span-5: span 1;
+
+  display: grid;
+  grid-template-columns: repeat(1, 1fr);
+  grid-gap: 1rem;
+
+  @include media-breakpoint-up(sm) {
+    --span-2: span 2;
+    --span-3: span 2;
+    --span-4: span 2;
+    --span-5: span 2;
+
+    grid-template-columns: repeat(2, 1fr);
+  }
 
-[class^="column-"],
-[class*=" column-"] {
-  padding-bottom: 1rem;
-  column-gap: 2rem;
+  @include media-breakpoint-up(md) {
+    --span-3: span 3;
+    --span-4: span 4;
+    --span-5: span 4;
 
-  > div {
-    display: inline-flex;
-    flex-direction: column;
-    width: 100%;
-    break-inside: avoid;
-    page-break-inside: avoid;
+    grid-template-columns: repeat(4, 1fr);
+    grid-gap: 1rem 2rem;
+  }
 
-    &.hidden {
-      display: none;
-    }
+  @include media-breakpoint-up(lg) {
+    --span-5: span 5;
 
-    .control-label {
-      width: 100%;
-    }
+    grid-template-columns: repeat(6, 1fr);
   }
 
-  .form-no-columns & {
-    column-count: auto;
+  > * {
+    grid-column: 1 / -1;
   }
-}
 
-@include media-breakpoint-up(sm) {
-  .column-count-sm-2 {
-    column-count: 2;
+  .stack {
+    flex-direction: column;
   }
 
-  .column-count-sm-3 {
-    column-count: 3;
+  .span-1 {
+    grid-column: 1 / var(--span-1);
+
+    &-inline {
+      grid-column: var(--span-1);
+    }
   }
-}
 
-@include media-breakpoint-up(md) {
-  .column-count-md-2 {
-    column-count: 2;
+  .span-2 {
+    grid-column: 1 / var(--span-2);
+
+    &-inline {
+      grid-column: var(--span-2);
+    }
   }
 
-  .column-count-md-3 {
-    column-count: 3;
+  .span-3 {
+    grid-column: 1 / var(--span-3);
+
+    &-inline {
+      grid-column: var(--span-3);
+    }
   }
-}
 
-@include media-breakpoint-up(lg) {
-  .column-count-lg-2 {
-    column-count: 2;
+  .span-4 {
+    grid-column: 1 / var(--span-4);
+
+    &-inline {
+      grid-column: var(--span-4);
+    }
   }
 
-  .column-count-lg-3 {
-    column-count: 3;
+  .span-5 {
+    grid-column: 1 / var(--span-5);
+
+    &-inline {
+      grid-column: var(--span-5);
+    }
+  }
+
+  @include media-breakpoint-up(lg) {
+    .offset-1 {
+      grid-column-start: 2;
+    }
+
+    .offset-2 {
+      grid-column-start: 3;
+    }
+
+    .offset-3 {
+      grid-column-start: 4;
+    }
+
+    .offset-4 {
+      grid-column-start: 5;
+    }
+
+    .offset-5 {
+      grid-column-start: 6;
+    }
   }
 }
 
+
 // Sizing
 
 .w-1 {
diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php
index 97c6501a9698..77f8f0a43123 100644
--- a/layouts/joomla/content/options_default.php
+++ b/layouts/joomla/content/options_default.php
@@ -23,7 +23,7 @@
 		<p><?php echo $displayData->description; ?></p>
 	<?php endif; ?>
 	<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
-		<div>
+		<div class="form-grid">
 		<?php foreach ($fieldsnames as $fieldname) : ?>
 			<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
 				<?php $datashowon = ''; ?>
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index 926e8041fd6d..ae9cd0630bb3 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -128,7 +128,7 @@
 			echo '</div>';
 		}
 
-		echo '<div class="column-count-md-2 column-count-lg-3">';
+		echo '<div class="form-grid">';
 	}
 	// Tabs
 	elseif (!$hasParent)
@@ -165,7 +165,7 @@
 				echo '</div>';
 			}
 
-			echo '<div class="column-count-md-2 column-count-lg-3">';
+			echo '<div class="form-grid">';
 
 			$opentab = 2;
 		}