diff --git a/src/Model/Blog.php b/src/Model/Blog.php
index c843997..003e064 100644
--- a/src/Model/Blog.php
+++ b/src/Model/Blog.php
@@ -129,6 +129,17 @@ class Blog extends Page implements PermissionProvider
         'PostsPerPage'    => 10
     ];
 
+    private static array $scaffold_cms_fields_settings = [
+        'ignoreFields' => [
+            'PostsPerPage',
+        ],
+        'ignoreRelations' => [
+            'Editors',
+            'Writers',
+            'Contributors',
+        ],
+    ];
+
     /**
      * @var string
      */
diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php
index 38cdb55..754a4e9 100644
--- a/src/Model/BlogPost.php
+++ b/src/Model/BlogPost.php
@@ -3,13 +3,9 @@
 namespace SilverStripe\Blog\Model;
 
 use Page;
-use SilverStripe\AssetAdmin\Forms\UploadField;
 use SilverStripe\Assets\Image;
 use SilverStripe\Control\Controller;
 use SilverStripe\Core\Config\Config;
-use SilverStripe\Forms\DatetimeField;
-use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
 use SilverStripe\Forms\ListboxField;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\ToggleCompositeField;
@@ -23,7 +19,6 @@ use SilverStripe\Security\Group;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
-use SilverStripe\TagField\TagField;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\ArrayData;
 use SilverStripe\View\Requirements;
@@ -100,6 +95,15 @@ class BlogPost extends Page
         'Authors'    => Member::class
     ];
 
+    private static array $scaffold_cms_fields_settings = [
+        'ignoreFields' => [
+            'AuthorNames',
+        ],
+        'ignoreRelations' => [
+            'Authors',
+        ],
+    ];
+
     /**
      * The ProvideComments db column is defined in the silverstripe/comments module
      * The InheritSideBar db column is defined in the silverstripe/widgets module
@@ -252,42 +256,40 @@ class BlogPost extends Page
         Requirements::javascript('silverstripe/blog:client/dist/js/main.bundle.js');
 
         $this->beforeUpdateCMSFields(function ($fields) {
-            $uploadField = UploadField::create('FeaturedImage', _t(__CLASS__ . '.FeaturedImage', 'Featured Image'));
-            $uploadField->getValidator()->setAllowedExtensions(['jpg', 'jpeg', 'png', 'gif']);
+            $uploadField = $fields->dataFieldByName('FeaturedImage');
+            $uploadField?->getValidator()->setAllowedExtensions(['jpg', 'jpeg', 'png', 'gif']);
 
             $uploadDirectory = $this->config()->get('featured_images_directory');
             if ($uploadDirectory != '') {
-                $uploadField->setFolderName($uploadDirectory);
+                $uploadField?->setFolderName($uploadDirectory);
             }
 
-            /**
-             * @var FieldList $fields
-             */
-            $fields->insertAfter('Content', $uploadField);
-
-            $summary = HtmlEditorField::create('Summary', false);
-            $summary->setRows(5);
-            $summary->setDescription(_t(
+            $summaryField = $fields->dataFieldByName('Summary');
+            $fields->removeByName('Summary');
+            $summaryField?->setTitle('');
+            $summaryField?->setRows(5);
+            $summaryField?->setDescription(_t(
                 __CLASS__ . '.SUMMARY_DESCRIPTION',
                 'If no summary is specified the first 30 words will be used.'
             ));
 
-            $summaryHolder = ToggleCompositeField::create(
-                'CustomSummary',
-                _t(__CLASS__ . '.CUSTOMSUMMARY', 'Add A Custom Summary'),
-                [
-                    $summary,
-                ]
-            );
-            $summaryHolder->setHeadingLevel(4);
-            $summaryHolder->addExtraClass('custom-summary');
+            if ($summaryField) {
+                $summaryHolder = ToggleCompositeField::create(
+                    'CustomSummary',
+                    _t(__CLASS__ . '.CUSTOMSUMMARY', 'Add A Custom Summary'),
+                    [
+                        $summaryField,
+                    ]
+                );
+                $summaryHolder->setHeadingLevel(4);
+                $summaryHolder->addExtraClass('custom-summary');
 
-            if ($this->Summary) {
-                $summaryHolder->setStartClosed(false);
+                if ($this->Summary) {
+                    $summaryHolder->setStartClosed(false);
+                }
+                $fields->insertAfter($uploadField ? 'FeaturedImage' : 'Content', $summaryHolder);
             }
 
-            $fields->insertAfter('FeaturedImage', $summaryHolder);
-
             $authorField = ListboxField::create(
                 'Authors',
                 _t(__CLASS__ . '.Authors', 'Authors'),
@@ -312,10 +314,9 @@ class BlogPost extends Page
                 $authorNames = $authorNames->performDisabledTransformation();
             }
 
-            $publishDate = DatetimeField::create('PublishDate', _t(__CLASS__ . '.PublishDate', 'Publish Date'));
-
+            $publishDate = $fields->dataFieldByName('PublishDate');
             if (!$this->PublishDate) {
-                $publishDate->setDescription(
+                $publishDate?->setDescription(
                     _t(
                         __CLASS__ . '.PublishDate_Description',
                         'Will be set to "now" if published without a value.'
@@ -323,35 +324,23 @@ class BlogPost extends Page
                 );
             }
 
-            // Get categories and tags
-            $parent = $this->Parent();
-            $categories = $parent instanceof Blog
-                ? $parent->Categories()
-                : BlogCategory::get();
-            $tags = $parent instanceof Blog
-                ? $parent->Tags()
-                : BlogTag::get();
+            $postOptions = [];
+            if ($publishDate) {
+                $postOptions[] = $publishDate;
+            }
+            $categories = $fields->dataFieldByName('Categories');
+            if ($categories) {
+                $postOptions[] = $categories;
+            }
+            $tags = $fields->dataFieldByName('Tags');
+            if ($tags) {
+                $postOptions[] = $tags;
+            }
 
             $fields->addFieldsToTab(
                 'Root.PostOptions',
                 [
-                    $publishDate,
-                    TagField::create(
-                        'Categories',
-                        _t(__CLASS__ . '.Categories', 'Categories'),
-                        $categories,
-                        $this->Categories()
-                    )
-                        ->setCanCreate($this->canCreateCategories())
-                        ->setShouldLazyLoad(true),
-                    TagField::create(
-                        'Tags',
-                        _t(__CLASS__ . '.Tags', 'Tags'),
-                        $tags,
-                        $this->Tags()
-                    )
-                        ->setCanCreate($this->canCreateTags())
-                        ->setShouldLazyLoad(true),
+                    ...$postOptions,
                     $authorField,
                     $authorNames
                 ]
@@ -363,8 +352,6 @@ class BlogPost extends Page
 
         $fields = parent::getCMSFields();
 
-        $fields->fieldByName('Root')->setTemplate('TabSet_holder');
-
         return $fields;
     }
 
diff --git a/templates/SilverStripe/Blog/Forms/TabSet_holder.ss b/templates/SilverStripe/Blog/Forms/TabSet_holder.ss
deleted file mode 100644
index dd2337d..0000000
--- a/templates/SilverStripe/Blog/Forms/TabSet_holder.ss
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="blog-admin-outer">
-	<%-- this resets ths template (from TabSet_holder) and renders using forTemplate --%>
-	$setTemplate('')
-</div>