diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index c57385f2202d1..3965e5feda7cf 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -717,34 +717,61 @@
 		label="COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL"
 		description="COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC"
 		>
+
+		<field
+			name="num_leading_articles"
+			type="number"
+			label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+			default="1"
+			parentclass="stack span-1"
+		/>
+
 		<field
 			name="blog_class_leading"
 			type="text"
 			label="JGLOBAL_BLOG_CLASS_LEADING"
-			size="3"
 			validate="CssIdentifier"
+			parentclass="stack span-2-inline"
 		/>
 
 		<field
-			name="blog_class"
-			type="text"
-			label="JGLOBAL_BLOG_CLASS"
-			size="3"
-			validate="CssIdentifier"
+			name="num_intro_articles"
+			type="number"
+			label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+			default="4"
+			parentclass="stack span-1"
 		/>
 
 		<field
-			name="num_leading_articles"
-			type="number"
-			label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+			name="num_columns"
+			type="list"
+			label="JGLOBAL_NUM_COLUMNS_LABEL"
 			default="1"
-		/>
+			parentclass="stack span-1-inline"
+			>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+		</field>
 
 		<field
-			name="num_intro_articles"
-			type="number"
-			label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
-			default="4"
+			name="multi_column_order"
+			type="list"
+			label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+			default="0"
+			parentclass="stack span-1-inline"
+			>
+			<option value="0">JGLOBAL_BLOG_DOWN_OPTION</option>
+			<option value="1">JGLOBAL_BLOG_ACROSS_OPTION</option>
+		</field>
+
+		<field
+			name="blog_class"
+			type="text"
+			label="JGLOBAL_BLOG_CLASS"
+			validate="CssIdentifier"
+			parentclass="stack span-2 offset-1"
 		/>
 
 		<field
@@ -752,12 +779,7 @@
 			type="number"
 			label="JGLOBAL_NUM_LINKS_LABEL"
 			default="4"
-		/>
-
-		<field
-			name="spacer1"
-			type="spacer"
-			hr="true"
+			parentclass="stack span-1"
 		/>
 
 		<field
@@ -766,6 +788,7 @@
 			label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
 			default="0"
 			validate="options"
+			parentclass="span-2"
 			>
 			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
@@ -776,18 +799,13 @@
 			<option value="5">J5</option>
 		</field>
 
-		<field
-			name="spacer2"
-			type="spacer"
-			hr="true"
-		/>
-
 		<field
 			name="link_intro_image"
 			type="radio"
 			label="JGLOBAL_LINKED_INTRO_IMAGE_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="0"
+			parentclass="span-2"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index 60c06d69fc7e7..224ee0c254d59 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -354,8 +354,11 @@ JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND="Can't find the destination row for this move."
 JGLOBAL_BATCH_PROCESS="Process"
 JGLOBAL_BATCH_WORKFLOW_STATE_ROW_NOT_FOUND="Can't find the destination row for this state change."
 JGLOBAL_BLOG="Blog"
-JGLOBAL_BLOG_CLASS="Blog Class"
-JGLOBAL_BLOG_CLASS_LEADING="Blog Class (Leading Articles)"
+JGLOBAL_BLOG_ACROSS_OPTION="Across"
+JGLOBAL_BLOG_CLASS="Article Class"
+JGLOBAL_BLOG_CLASS_LEADING="Leading Article Class"
+JGLOBAL_BLOG_CLASS_NOTE_DESC ="You can add any CSS class for your own styling ideas.<br>Add a border on top with class boxed.<br>For image position use for example image-left, image-right. Add image-alternate for alternative ordering of intro-images."
+JGLOBAL_BLOG_DOWN_OPTION="Down"
 JGLOBAL_BLOG_LAYOUT_OPTIONS="Blog Layout"
 JGLOBAL_CATEGORIES_OPTIONS="Categories"
 JGLOBAL_CATEGORY_LAYOUT_DESC="Layout"
@@ -511,6 +514,7 @@ JGLOBAL_MODIFIED="Modified"
 JGLOBAL_MODIFIED_DATE="Modified Date"
 JGLOBAL_MOST_HITS="Most Hits"
 JGLOBAL_MOST_RECENT_FIRST="Most Recent First"
+JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Direction"
 JGLOBAL_MULTI_LEVEL="Multi Level"
 JGLOBAL_NAME_ASC="Name ascending"
 JGLOBAL_NAME_DESC="Name descending"
@@ -520,6 +524,7 @@ JGLOBAL_NO_ITEM_SELECTED="No items selected"
 JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
 JGLOBAL_NO_ORDER="No Order"
 JGLOBAL_NONAPPLICABLE="N/A"
+JGLOBAL_NUM_COLUMNS_LABEL="# Columns"
 JGLOBAL_NUM_INTRO_ARTICLES_DESC="Number of articles to show after the leading article. Articles will be shown in columns."
 JGLOBAL_NUM_INTRO_ARTICLES_LABEL="# Intro Articles"
 JGLOBAL_NUM_LEADING_ARTICLES_DESC="Number of leading articles to display as full-width at the beginning of the page."
diff --git a/components/com_content/tmpl/category/blog.php b/components/com_content/tmpl/category/blog.php
index 1ed8fea0dec0c..32ca43a38932e 100644
--- a/components/com_content/tmpl/category/blog.php
+++ b/components/com_content/tmpl/category/blog.php
@@ -93,7 +93,12 @@
 	?>
 
 	<?php if (!empty($this->intro_items)) : ?>
-		<div class="com-content-category-blog__items blog-items <?php echo $this->params->get('blog_class'); ?>">
+		<?php $blogClass = $this->params->get('blog_class', ''); ?>
+		<?php if ((int) $this->params->get('num_columns') > 1) : ?>
+			<?php $blogClass .= (int) $this->params->get('multi_column_order', 0) === 0 ? ' masonry-' : ' columns-'; ?>
+			<?php $blogClass .= (int) $this->params->get('num_columns'); ?>
+		<?php endif; ?>
+		<div class="com-content-category-blog__items blog-items <?php echo $blogClass; ?>">
 		<?php foreach ($this->intro_items as $key => &$item) : ?>
 			<div class="com-content-category-blog__item blog-item"
 				itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
diff --git a/components/com_content/tmpl/category/blog.xml b/components/com_content/tmpl/category/blog.xml
index b4f67026c9142..6dd58e83e0ddd 100644
--- a/components/com_content/tmpl/category/blog.xml
+++ b/components/com_content/tmpl/category/blog.xml
@@ -167,181 +167,197 @@
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
-			
+
 		</fieldset>
 
 		<fieldset name="advanced" label="JGLOBAL_BLOG_LAYOUT_OPTIONS" description="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL">
 
-				<field
-					name="blog_class_leading"
-					type="text"
-					label="JGLOBAL_BLOG_CLASS_LEADING"
-					useglobal="true"
-					size="3"
-					validate="CssIdentifier"
-				/>
+			<field
+				name="num_leading_articles"
+				type="number"
+				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				useglobal="true"
+				parentclass="stack span-1"
+			/>
 
-				<field
-					name="blog_class"
-					type="text"
-					label="JGLOBAL_BLOG_CLASS"
-					useglobal="true"
-					size="3"
-					validate="CssIdentifier"
-				/>
+			<field
+				name="blog_class_leading"
+				type="text"
+				label="JGLOBAL_BLOG_CLASS_LEADING"
+				parentclass="stack span-2-inline"
+				useglobal="true"
+				validate="CssIdentifier"
+			/>
 
-				<field
-					name="num_leading_articles"
-					type="text"
-					label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
-					useglobal="true"
-					size="3"
-				/>
+			<field
+				name="num_intro_articles"
+				type="number"
+				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				useglobal="true"
+				parentclass="stack span-1"
+			/>
 
-				<field
-					name="num_intro_articles"
-					type="text"
-					label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
-					useglobal="true"
-					size="3"
-				/>
+			<field
+				name="blog_class"
+				type="text"
+				label="JGLOBAL_BLOG_CLASS"
+				description="JGLOBAL_BLOG_CLASS_NOTE_DESC"
+				parentclass="stack span-2-inline"
+				useglobal="true"
+				validate="CssIdentifier"
+			/>
 
-				<field
-					name="num_links"
-					type="text"
-					label="JGLOBAL_NUM_LINKS_LABEL"
-					useglobal="true"
-					size="3"
-				/>
+			<field
+				name="num_columns"
+				type="text"
+				label="JGLOBAL_NUM_COLUMNS_LABEL"
+				parentclass="stack span-1-inline"
+				useglobal="true"
+			/>
 
-				<field
-					name="show_subcategory_content"
-					type="list"
-					label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
-					useglobal="true"
-					validate="options"
-					>
-					<option value="0">JNONE</option>
-					<option value="-1">JALL</option>
-					<option value="1">J1</option>
-					<option value="2">J2</option>
-					<option value="3">J3</option>
-					<option value="4">J4</option>
-					<option value="5">J5</option>
-				</field>
+			<field
+				name="multi_column_order"
+				type="list"
+				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+				parentclass="stack span-1-inline"
+				useglobal="true"
+				>
+				<option value="0">JGLOBAL_BLOG_DOWN_OPTION</option>
+				<option value="1">JGLOBAL_BLOG_ACROSS_OPTION</option>
+			</field>
 
-				<field
-					name="spacer1"
-					type="spacer"
-					hr="true"
-				/>
+			<field
+				name="num_links"
+				type="number"
+				label="JGLOBAL_NUM_LINKS_LABEL"
+				parentclass="stack span-1"
+				useglobal="true"
+			/>
 
-				<field
-					name="link_intro_image"
-					type="list"
-					label="JGLOBAL_LINKED_INTRO_IMAGE_LABEL"
-					useglobal="true"
-					validate="options"
-					>
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
+			<field
+				name="show_featured"
+				type="list"
+				label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
+				default=""
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				parentclass="stack span-1"
+				>
+				<option value="show">JSHOW</option>
+				<option value="hide">JHIDE</option>
+				<option value="only">JONLY</option>
+			</field>
 
-				<field
-					name="spacer2"
-					type="spacer"
-					hr="true"
-				/>
+			<field
+				name="link_intro_image"
+				type="list"
+				label="JGLOBAL_LINKED_INTRO_IMAGE_LABEL"
+				useglobal="true"
+				validate="options"
+				parentclass="stack span-1-inline"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
 
-				<field
-					name="orderby_pri"
-					type="list"
-					label="JGLOBAL_CATEGORY_ORDER_LABEL"
-					useglobal="true"
-					validate="options"
-					>
-					<option value="none">JGLOBAL_NO_ORDER</option>
-					<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
-					<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
-					<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
-				</field>
+			<field
+				name="show_subcategory_content"
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
+				useglobal="true"
+				validate="options"
+				parentclass="stack span-1-inline"
+				>
+				<option value="0">JNONE</option>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+			<field
+				name="orderby_pri"
+				type="list"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+				useglobal="true"
+				validate="options"
+				parentclass="stack span-2"
+				>
+				<option value="none">JGLOBAL_NO_ORDER</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
 
-				<field
-					name="orderby_sec"
-					type="list"
-					label="JGLOBAL_ARTICLE_ORDER_LABEL"
-					useglobal="true"
-					validate="options"
-					>
-					<option value="front">COM_CONTENT_FEATURED_ORDER</option>
-					<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
-					<option value="date">JGLOBAL_OLDEST_FIRST</option>
-					<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
-					<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
-					<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
-					<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
-					<option value="hits">JGLOBAL_MOST_HITS</option>
-					<option value="rhits">JGLOBAL_LEAST_HITS</option>
-					<option value="random">JGLOBAL_RANDOM_ORDER</option>
-					<option value="order">JGLOBAL_ORDERING</option>
-					<option	value="rorder">JGLOBAL_REVERSE_ORDERING</option>
-					<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
-					<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
-					<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
-					<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
-				</field>
+			<field
+				name="orderby_sec"
+				type="list"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+				useglobal="true"
+				validate="options"
+				parentclass="stack span-2-inline"
+				>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="random">JGLOBAL_RANDOM_ORDER</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+				<option	value="rorder">JGLOBAL_REVERSE_ORDERING</option>
+				<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+				<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+				<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
+				<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+			</field>
 
-				<field
-					name="order_date"
-					type="list"
-					label="JGLOBAL_ORDERING_DATE_LABEL"
-					useglobal="true"
-					validate="options"
-					>
-					<option value="created">JGLOBAL_CREATED</option>
-					<option value="modified">JGLOBAL_MODIFIED</option>
-					<option value="published">JPUBLISHED</option>
-					<option value="unpublished">JUNPUBLISHED</option>
-				</field>
+			<field
+				name="order_date"
+				type="list"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+				useglobal="true"
+				validate="options"
+				parentclass="stack span-2-inline"
+				>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+				<option value="unpublished">JUNPUBLISHED</option>
+			</field>
 
-				<field
-					name="show_pagination"
-					type="list"
-					label="JGLOBAL_PAGINATION_LABEL"
-					useglobal="true"
-					class="form-select-color-state"
-					validate="options"
-					>
-					<option value="0">JHIDE</option>
-					<option value="1">JSHOW</option>
-					<option value="2">JGLOBAL_AUTO</option>
-				</field>
+			<field
+				name="show_pagination"
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				parentclass="stack span-1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
 
-				<field
-					name="show_pagination_results"
-					type="list"
-					label="JGLOBAL_PAGINATION_RESULTS_LABEL"
-					useglobal="true"
-					class="form-select-color-state"
-					validate="options"
-					>
-					<option value="0">JHIDE</option>
-					<option value="1">JSHOW</option>
-				</field>
+			<field
+				name="show_pagination_results"
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				parentclass="stack span-1-inline"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-				<field
-					name="show_featured"
-					type="list"
-					default=""
-					label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
-					useglobal="true"
-					class="form-select-color-state"
-					validate="options"
-					>
-					<option value="show">JSHOW</option>
-					<option value="hide">JHIDE</option>
-					<option value="only">JONLY</option>
-				</field>
 		</fieldset>
 
 		<fieldset name="article"
diff --git a/components/com_content/tmpl/featured/default.php b/components/com_content/tmpl/featured/default.php
index 573badc1d4d32..a70bfcb06b4bc 100644
--- a/components/com_content/tmpl/featured/default.php
+++ b/components/com_content/tmpl/featured/default.php
@@ -38,7 +38,12 @@
 	<?php endif; ?>
 
 	<?php if (!empty($this->intro_items)) : ?>
-		<div class="blog-items <?php echo $this->params->get('blog_class'); ?>">
+		<?php $blogClass = $this->params->get('blog_class', ''); ?>
+		<?php if ((int) $this->params->get('num_columns') > 1) : ?>
+			<?php $blogClass .= (int) $this->params->get('multi_column_order', 0) === 0 ? ' masonry-' : ' columns-'; ?>
+			<?php $blogClass .= (int) $this->params->get('num_columns'); ?>
+		<?php endif; ?>
+		<div class="blog-items <?php echo $blogClass; ?>">
 		<?php foreach ($this->intro_items as $key => &$item) : ?>
 			<div class="blog-item"
 				itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
diff --git a/components/com_content/tmpl/featured/default.xml b/components/com_content/tmpl/featured/default.xml
index f4cc9a8c08da1..034470ee6b7da 100644
--- a/components/com_content/tmpl/featured/default.xml
+++ b/components/com_content/tmpl/featured/default.xml
@@ -11,7 +11,7 @@
 
 	<!-- Add fields to the parameters object for the layout. -->
 	<fields name="params">
-		<fieldset name="advanced" label="COM_MENUS_LAYOUT_FEATURED_OPTIONS">
+		<fieldset name="advanced" label="JGLOBAL_BLOG_LAYOUT_OPTIONS" description="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL">
 			<field
 				name="featured_categories"
 				type="category"
@@ -20,6 +20,7 @@
 				multiple="true"
 				layout="joomla.form.field.list-fancy-select"
 				default=""
+				parentclass="stack span-3"
 				>
 				<option value="">JOPTION_ALL_CATEGORIES</option>
 			</field>
@@ -29,84 +30,89 @@
 				type="hidden"
 				default="blog"
 			/>
-
 			<field
-				name="bloglayout"
-				type="spacer"
-				label="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL"
-				class="text"
+				name="num_leading_articles"
+				type="number"
+				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				useglobal="true"
+				parentclass="stack span-1"
 			/>
 
 			<field
 				name="blog_class_leading"
 				type="text"
 				label="JGLOBAL_BLOG_CLASS_LEADING"
+				parentclass="stack span-2-inline"
 				useglobal="true"
-				size="3"
 				validate="CssIdentifier"
 			/>
 
+			<field
+				name="num_intro_articles"
+				type="number"
+				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				useglobal="true"
+				parentclass="stack span-1"
+			/>
+
 			<field
 				name="blog_class"
 				type="text"
 				label="JGLOBAL_BLOG_CLASS"
+				description="JGLOBAL_BLOG_CLASS_NOTE_DESC"
+				parentclass="stack span-2-inline"
 				useglobal="true"
-				size="3"
 				validate="CssIdentifier"
 			/>
 
 			<field
-				name="num_leading_articles"
-				type="number"
-				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				name="num_columns"
+				type="text"
+				label="JGLOBAL_NUM_COLUMNS_LABEL"
+				parentclass="stack span-1-inline"
 				useglobal="true"
 			/>
 
 			<field
-				name="num_intro_articles"
-				type="number"
-				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				name="multi_column_order"
+				type="list"
+				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+				parentclass="stack span-1-inline"
 				useglobal="true"
-			/>
+				>
+				<option value="0">JGLOBAL_BLOG_DOWN_OPTION</option>
+				<option value="1">JGLOBAL_BLOG_ACROSS_OPTION</option>
+			</field>
 
 			<field
 				name="num_links"
 				type="number"
 				label="JGLOBAL_NUM_LINKS_LABEL"
+				parentclass="stack span-1"
 				useglobal="true"
 			/>
 
-			<field
-				name="spacer1"
-				type="spacer"
-				hr="true"
-			/>
-
 			<field
 				name="link_intro_image"
 				type="list"
 				label="JGLOBAL_LINKED_INTRO_IMAGE_LABEL"
 				useglobal="true"
 				validate="options"
+				parentclass="stack span-2-inline"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
 
-			<field
-				name="spacer2"
-				type="spacer"
-				hr="true"
-			/>
-
 			<field
 				name="orderby_pri"
 				type="list"
 				label="JGLOBAL_CATEGORY_ORDER_LABEL"
 				useglobal="true"
 				validate="options"
+				parentclass="stack span-2"
 				>
-				<option value="none">JGLOBAL_No_Order</option>
+				<option value="none">JGLOBAL_NO_ORDER</option>
 				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
 				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
 				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
@@ -118,6 +124,7 @@
 				label="JGLOBAL_ARTICLE_ORDER_LABEL"
 				useglobal="true"
 				validate="options"
+				parentclass="stack span-2-inline"
 				>
 				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
 				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
@@ -143,10 +150,12 @@
 				label="JGLOBAL_ORDERING_DATE_LABEL"
 				useglobal="true"
 				validate="options"
+				parentclass="stack span-2-inline"
 				>
 				<option value="created">JGLOBAL_CREATED</option>
 				<option value="modified">JGLOBAL_MODIFIED</option>
 				<option value="published">JPUBLISHED</option>
+				<option value="unpublished">JUNPUBLISHED</option>
 			</field>
 
 			<field
@@ -156,6 +165,7 @@
 				useglobal="true"
 				class="form-select-color-state"
 				validate="options"
+				parentclass="stack span-2"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -169,11 +179,11 @@
 				useglobal="true"
 				class="form-select-color-state"
 				validate="options"
+				parentclass="stack span-2-inline"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-
 		</fieldset>
 
 		<fieldset name="article"