diff --git a/app/Enums/Blocks/BlockType.php b/app/Enums/Blocks/BlockType.php
index dbccfa20..a81e9933 100644
--- a/app/Enums/Blocks/BlockType.php
+++ b/app/Enums/Blocks/BlockType.php
@@ -11,6 +11,7 @@ enum BlockType: string
     /* List of the content blocks available to the application. */
     case HEADER_LOGO = 'header-logo';
     case PANEL_LINKS = 'panel-links';
+    case PRIVACY_POLICY = 'privacy-policy';
     case SECTION_DIVIDER = 'section-divider';
     case STACK = 'stack';
     case TABS = 'tabs';
@@ -25,6 +26,9 @@ enum BlockType: string
     public function staticData(): array
     {
         return match ($this) {
+            self::PRIVACY_POLICY => [
+                'html' => view('partials.static-blocks.privacy')->render(),
+            ],
             self::STACK => [
                 'html' => view('partials.static-blocks.stack', [
                     'laravel_version' => (new LaravelVersionFormatterResource)->getValue(),
@@ -41,6 +45,7 @@ public function staticData(): array
      *
      * @return array{
      *  label: string,
+     *  description: string,
      *  inputs: array<int, array<string, string>>,
      *  inputsRepeatable: array<int, array<string, string>>,
      * }
@@ -66,6 +71,11 @@ public function schema(): array
                     FormInputType::TEXT->schema('Panel URL', 'url'),
                 ],
             ],
+            self::PRIVACY_POLICY => [
+                'label' => 'Privacy Policy',
+                'description' => 'Privacy policy for the ' . config('app.name')
+                    . ' website, which covers how this app handles your data.',
+            ],
             self::SECTION_DIVIDER => [
                 'label' => 'Section Divider',
             ],
@@ -90,6 +100,7 @@ public function schema(): array
 
         return [
             'label' => $block_schema['label'] ?? '{unknown}',
+            'description' => $block_schema['description'] ?? '',
             'inputs' => $block_schema['inputs'] ?? [],
             'inputsRepeatable' => $block_schema['inputsRepeatable'] ?? [],
         ];
diff --git a/app/Enums/Webpages/WebpageStatus.php b/app/Enums/Webpages/WebpageStatus.php
new file mode 100644
index 00000000..74886896
--- /dev/null
+++ b/app/Enums/Webpages/WebpageStatus.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Enums\Webpages;
+
+enum WebpageStatus: int
+{
+    /* List of the webpage statuses available to the application. */
+    case DRAFT = 1;
+    case PUBLISHED = 2;
+
+    /** Get the status's label. */
+    public function label(): string
+    {
+        return match ($this) {
+            self::DRAFT => 'Draft',
+            self::PUBLISHED => 'Published',
+        };
+    }
+}
diff --git a/app/Enums/Webpages/WebpageTemplate.php b/app/Enums/Webpages/WebpageTemplate.php
index deab6569..2fa5e2c1 100644
--- a/app/Enums/Webpages/WebpageTemplate.php
+++ b/app/Enums/Webpages/WebpageTemplate.php
@@ -14,7 +14,6 @@ enum WebpageTemplate: string
     case AUTH_REGISTER = 'Auth/AuthRegister';
     case PROFILE_DASHBOARD = 'Profile/ProfileDashboard';
     case PROFILE_EDIT = 'Profile/ProfileEdit';
-    case PUBLIC_INDEX = 'Public/PublicHomepage';
     case PUBLIC_CONTENT = 'Public/PublicContent';
     case PUBLIC_CONTENT_CONTROLS = 'Public/PublicContentControls';
     case PUBLIC_CONTENT_FORMS = 'Public/PublicContentForms';
diff --git a/app/Http/Controllers/Admin/PageController.php b/app/Http/Controllers/Admin/PageController.php
index b846b7b3..2f0952fd 100644
--- a/app/Http/Controllers/Admin/PageController.php
+++ b/app/Http/Controllers/Admin/PageController.php
@@ -6,9 +6,11 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\PageUpdateRequest;
 use App\Http\Resources\Views\Admin\Pages\CreateEditPageResource;
+use App\Http\Resources\Views\Public\Content\PageContentResource;
 use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
 use App\Models\Page;
 use App\Repositories\Views\AdminViewRepository;
+use App\Repositories\Views\PublicViewRepository;
 use App\Services\Admin\PageAdminService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Response;
@@ -16,6 +18,25 @@
 
 final class PageController extends Controller
 {
+    /**
+     * Display the given page's preview.
+     *
+     * @throws HttpException
+     */
+    public function show(Page $page): RedirectResponse|Response
+    {
+        if (!$page->template) {
+            abort(404);
+        }
+
+        return (new PublicViewRepository)
+            ->getViewDetails(
+                $page->template,
+                (new PageContentResource($page))->getItem(),
+                (new PageMetadataResource)->getItem($page)
+            );
+    }
+
     /**
      * Display the edit view for the given page.
      *
diff --git a/app/Http/Controllers/Public/PageController.php b/app/Http/Controllers/Public/PageController.php
index bb6e0e39..7184aea7 100644
--- a/app/Http/Controllers/Public/PageController.php
+++ b/app/Http/Controllers/Public/PageController.php
@@ -27,9 +27,10 @@ public function show(Page $page): RedirectResponse|Response
             return to_route('home');
         }
 
-        $template = WebpageTemplate::tryFrom($page?->template ?? '');
-
-        if (!$template) {
+        if (
+            !$page->isPublished()
+            || !$template = WebpageTemplate::tryFrom($page?->template ?? '')
+        ) {
             abort(404);
         }
 
diff --git a/app/Http/Controllers/Public/PrivacyPolicyController.php b/app/Http/Controllers/Public/PrivacyPolicyController.php
index b2fab4e4..faf07fc9 100644
--- a/app/Http/Controllers/Public/PrivacyPolicyController.php
+++ b/app/Http/Controllers/Public/PrivacyPolicyController.php
@@ -2,26 +2,31 @@
 
 namespace App\Http\Controllers\Public;
 
-use App\Enums\Webpages\WebpageTemplate;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\Views\Public\Content\PageContentResource;
-use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
-use App\Models\Page;
+use App\Http\Resources\Views\Public\Content\PrivacyPolicyContentResource;
 use App\Repositories\Views\PublicViewRepository;
 use Inertia\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 final class PrivacyPolicyController extends Controller
 {
-    /** Display the public privacy policy page. */
+    /**
+     * Display the public privacy policy page.
+     *
+     * @throws HttpException
+     */
     public function __invoke(): Response
     {
-        $page = Page::where('slug', 'privacy')->first() ?? Page::factory()->privacyPage()->make();
-        $template = $page?->template ?? WebpageTemplate::PUBLIC_CONTENT->value;
+        $content_resource = new PrivacyPolicyContentResource;
+
+        if (!$template = $content_resource->getTemplate()) {
+            abort(404);
+        }
 
         return (new PublicViewRepository)->getViewDetails(
-            $template,
-            (new PageContentResource($page))->getItem(),
-            (new PageMetadataResource)->getItem($page)
+            $template->value,
+            $content_resource->getItem(),
+            $content_resource->getMetaData()
         );
     }
 }
diff --git a/app/Http/Requests/Admin/PageUpdateRequest.php b/app/Http/Requests/Admin/PageUpdateRequest.php
index 37323057..9d1dbc55 100644
--- a/app/Http/Requests/Admin/PageUpdateRequest.php
+++ b/app/Http/Requests/Admin/PageUpdateRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Admin;
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Interfaces\Requests\RequestInterface;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -17,10 +18,8 @@ public function rules(): array
         return [
             'blocks' => ['nullable', 'max:5120'],
             'title' => ['required', 'string', 'max:255'],
-            'subtitle' => ['nullable', 'string', 'max:255'],
-            'content' => ['nullable', 'string', 'max:5120'],
-            'metaTitle' => ['nullable', 'string', 'max:255'],
             'metaDescription' => ['nullable', 'string', 'max:255'],
+            'webpageStatusId' => ['required', 'integer', 'max:' . WebpageStatus::PUBLISHED->value],
             'inSitemap' => ['required', 'boolean'],
         ];
     }
diff --git a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
index 71b00531..43c066e5 100644
--- a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
+++ b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources\Views\Admin\Pages;
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Http\Resources\Views\Admin\Blocks\AdminBlocksResource;
 use App\Interfaces\Resources\Items\PageItemInterface;
 use App\Models\Page;
@@ -19,12 +20,11 @@ final class CreateEditPageResource implements PageItemInterface
      *      data: array<string, array<int, string>|string>,
      *      schema: array{label:string, inputs:array<int, bool|int|string>}
      *  }>,
-     *  content: string,
-     *  subtitle: string,
      *  title: string,
-     *  metaTitle: string,
      *  metaDescription: string,
      *  inSitemap: bool,
+     *  slug: string|null,
+     *  webpageStatusId: \Closure,
      * }
      */
     public function getItem(Page $page): array
@@ -32,12 +32,12 @@ public function getItem(Page $page): array
         return [
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
-            'content' => $page->getContent(),
-            'subtitle' => $page->getSubtitle(),
             'title' => $page->getTitle(),
-            'metaTitle' => $page->getMetaTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'slug' => $page->slug,
+            'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
+                ?? WebpageStatus::DRAFT->value,
         ];
     }
 }
diff --git a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
index f1cac1da..9cc5e933 100644
--- a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources\Views\Public\Content;
 
 use App\Enums\Blocks\BlockType;
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Interfaces\Resources\Items\ConstantItemInterface;
 use App\Models\Block;
@@ -17,6 +18,7 @@ public function __construct(
         if (!$this->page->id) {
             $this->page = Page::query()
                 ->isHomepage()
+                ->published()
                 ->with('blocks')
                 ->first()
                 ?? new Page;
@@ -35,9 +37,6 @@ public function __construct(
      *      type: string,
      *      data: array<string, array<int, string>|string>,
      *  }>,
-     *  bodytext: string,
-     *  heading: string,
-     *  subheading: string,
      * }
      */
     public function getItem(): array
@@ -55,7 +54,8 @@ public function getTemplate(): ?WebpageTemplate
     public function setDefaultModel(): void
     {
         $this->page = new Page([
-            'template' => WebpageTemplate::PUBLIC_INDEX->value,
+            'webpage_status_id' => WebpageStatus::PUBLISHED->value,
+            'template' => WebpageTemplate::PUBLIC_CONTENT->value,
             'slug' => 'home',
             'title' => config('app.name'),
             'meta_description' => config('metadata.description'),
diff --git a/app/Http/Resources/Views/Public/Content/PageContentResource.php b/app/Http/Resources/Views/Public/Content/PageContentResource.php
index 3c40f9b6..43936749 100644
--- a/app/Http/Resources/Views/Public/Content/PageContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/PageContentResource.php
@@ -21,18 +21,12 @@ public function __construct(
      *      type: string,
      *      data: array<string, array<int, string>|string>,
      *  }>,
-     *  bodytext: string,
-     *  heading: string,
-     *  subheading: string,
      * }
      */
     public function getItem(): array
     {
         return [
             'blocks' => (new BlocksResource)->getItems($this->page->blocks),
-            'bodytext' => $this->page->getContent(),
-            'heading' => $this->page->getTitle(),
-            'subheading' => $this->page->getSubtitle(),
         ];
     }
 }
diff --git a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
new file mode 100644
index 00000000..5309472d
--- /dev/null
+++ b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Http\Resources\Views\Public\Content;
+
+use App\Enums\Blocks\BlockType;
+use App\Enums\Webpages\WebpageStatus;
+use App\Enums\Webpages\WebpageTemplate;
+use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
+use App\Interfaces\Resources\Items\ConstantItemInterface;
+use App\Models\Block;
+use App\Models\Page;
+
+final class PrivacyPolicyContentResource implements ConstantItemInterface
+{
+    /** Instantiate the resource. */
+    public function __construct(
+        protected Page $page = new Page,
+    ) {
+        if (!$this->page->id) {
+            $this->page = Page::query()
+                ->published()
+                ->where('slug', 'privacy')
+                ->with('blocks')
+                ->first()
+                ?? new Page;
+        }
+
+        if (!$this->getTemplate()) {
+            $this->setDefaultModel();
+        }
+    }
+
+    /**
+     * Get the content array for the site's privacy page.
+     *
+     * @return array{
+     *  blocks: array<int, array{
+     *      type: string,
+     *      data: array<string, array<int, string>|string>,
+     *  }>,
+     * }
+     */
+    public function getItem(): array
+    {
+        return (new PageContentResource($this->page))->getItem();
+    }
+
+    /**
+     * Get the meta-data array for the site's privacy page.
+     *
+     * @return array{canonical: string, description: string, title: string}
+     */
+    public function getMetaData(): array
+    {
+        return (new PageMetadataResource)->getItem($this->page);
+    }
+
+    /** Get the template for the resource. */
+    public function getTemplate(): ?WebpageTemplate
+    {
+        return $this->page->getTemplate();
+    }
+
+    /** Set the resource's page to the default privacy page model. */
+    public function setDefaultModel(): void
+    {
+        $this->page = new Page([
+            'webpage_status_id' => WebpageStatus::PUBLISHED->value,
+            'template' => WebpageTemplate::PUBLIC_CONTENT->value,
+            'slug' => 'privacy',
+            'title' => 'Privacy Policy',
+            'meta_title' => 'Privacy Policy',
+            'meta_description' => 'Privacy policy for the ' . config('app.name') . ' website, which covers how this app handles your data.',
+        ]);
+
+        $this->page->blocks = collect([
+            new Block([
+                'type' => BlockType::WYSIWYG->value,
+                'parent_type' => Page::class,
+                'parent_id' => $this->page->id,
+                'data' => json_encode([
+                    'html' => '<h2 class="text-page-title">PRIVACY POLICY</h2>
+                        <p class="text-page-subtitle">' . config('app.name') . '</p>',
+                ]),
+            ]),
+
+            new Block([
+                'type' => BlockType::SECTION_DIVIDER->value,
+                'parent_type' => Page::class,
+                'parent_id' => $this->page->id,
+            ]),
+
+            new Block([
+                'type' => BlockType::PRIVACY_POLICY->value,
+                'parent_type' => Page::class,
+                'parent_id' => $this->page->id,
+            ]),
+        ]);
+
+        $page = Page::factory()->privacyPage()->make();
+    }
+}
diff --git a/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php b/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php
index ee67079a..2e5da6c9 100644
--- a/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php
+++ b/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php
@@ -17,7 +17,7 @@ public function getItem(Page $page): array
         return [
             'canonical' => $page->getUrl(),
             'description' => $page->getMetaDescription(),
-            'title' => $page->getMetaTitle(),
+            'title' => $page->getTitle(),
         ];
     }
 }
diff --git a/app/Http/Resources/Views/Public/Summaries/PageSummaryResource.php b/app/Http/Resources/Views/Public/Summaries/PageSummaryResource.php
deleted file mode 100644
index c43ea47d..00000000
--- a/app/Http/Resources/Views/Public/Summaries/PageSummaryResource.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Views\Public\Summaries;
-
-use App\Interfaces\Resources\Items\PageItemInterface;
-use App\Models\Page;
-
-final class PageSummaryResource implements PageItemInterface
-{
-    /**
-     * Get the resource as an array.
-     *
-     * @return array{content: string, title: string, url: string}
-     */
-    public function getItem(Page $page): array
-    {
-        return [
-            'content' => $page->getMetaDescription(),
-            'title' => $page->getTitle(),
-            'url' => $page->getUrl(),
-        ];
-    }
-}
diff --git a/app/Models/Page.php b/app/Models/Page.php
index 08ac2e5d..ba6d3cbb 100644
--- a/app/Models/Page.php
+++ b/app/Models/Page.php
@@ -28,11 +28,9 @@ final class Page extends Model
      * @var array<int, string>
      */
     protected $fillable = [
+        'webpage_status_id',
         'slug',
         'title',
-        'subtitle',
-        'content',
-        'meta_title',
         'meta_description',
         'meta_keywords',
         'open_graph_id',
@@ -41,12 +39,6 @@ final class Page extends Model
         'is_homepage',
     ];
 
-    /** Get the HTML content string for the page. */
-    public function getContent(): string
-    {
-        return $this->content ?? '';
-    }
-
     /** Get the public URL's path for the page. */
     public function getPath(): string
     {
@@ -55,12 +47,6 @@ public function getPath(): string
             : route('page.show', $this->slug, false);
     }
 
-    /** Get the subtitle for the page. */
-    public function getSubtitle(): string
-    {
-        return $this->subtitle ?? '';
-    }
-
     /** Get the public URL for the page. */
     public function getUrl(): string
     {
diff --git a/app/Traits/HasPageView.php b/app/Traits/HasPageView.php
index 8911780c..63fec443 100644
--- a/app/Traits/HasPageView.php
+++ b/app/Traits/HasPageView.php
@@ -2,11 +2,13 @@
 
 namespace App\Traits;
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 
 /**
+ * @method Builder|static published()
  * @method Builder|static inSitemap()
  * @method static Builder|static query()
  */
@@ -26,12 +28,6 @@ public function getMetaKeywords(): string
         return $this->meta_keywords ?? '';
     }
 
-    /** Get the meta-title for the resource. */
-    public function getMetaTitle(): string
-    {
-        return ($this->meta_title && trim($this->meta_title) !== '') ? $this->meta_title : $this->getTitle();
-    }
-
     /** Get the webpage template for the resource. */
     public function getTemplate(): ?WebpageTemplate
     {
@@ -50,6 +46,12 @@ public function isInSitemap(): bool
         return $this->in_sitemap ?? false;
     }
 
+    /** Returns true if the item is marked as published. */
+    public function isPublished(): bool
+    {
+        return $this->webpage_status_id === WebpageStatus::PUBLISHED->value;
+    }
+
     /** Returns all models that should be in the sitemap (in_sitemap = 1). */
     public function scopeInSitemap(Builder|QueryBuilder $query): Builder|QueryBuilder
     {
@@ -57,4 +59,12 @@ public function scopeInSitemap(Builder|QueryBuilder $query): Builder|QueryBuilde
             $query->where('in_sitemap', 1);
         });
     }
+
+    /** Returns all models that are Published (webpage_status_id = 2). */
+    public function scopePublished(Builder|QueryBuilder $query): Builder|QueryBuilder
+    {
+        return $query->where(function ($query) {
+            $query->where('webpage_status_id', WebpageStatus::PUBLISHED->value);
+        });
+    }
 }
diff --git a/composer.json b/composer.json
index f9a760e3..eda9bef2 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php": "8.2.*||8.3.*",
         "guzzlehttp/guzzle": "^7.8.1",
         "inertiajs/inertia-laravel": "^1.3",
-        "laravel/framework": "^11.15",
+        "laravel/framework": "^11.16",
         "laravel/tinker": "^2.9.0",
         "tightenco/ziggy": "^1.8.2"
     },
diff --git a/composer.lock b/composer.lock
index edc48890..16ce58dc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "49f7ea1856eb411443953713f6d87d27",
+    "content-hash": "4259c6564f1c84080d1f8e1bc3bf8853",
     "packages": [
         {
             "name": "brick/math",
@@ -1128,16 +1128,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.15.0",
+            "version": "v11.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b"
+                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ba85f1c019bed59b3c736c9c4502805efd0ba84b",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
+                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
                 "shasum": ""
             },
             "require": {
@@ -1330,7 +1330,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-07-09T15:38:12+00:00"
+            "time": "2024-07-16T14:33:07+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -6863,16 +6863,16 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v2.34.8",
+            "version": "v2.34.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "e8f122bf47585c06431e0056189ec6bfd6f41f57"
+                "reference": "ef120125e036bf84c9e46a9e62219702f5b92e16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/e8f122bf47585c06431e0056189ec6bfd6f41f57",
-                "reference": "e8f122bf47585c06431e0056189ec6bfd6f41f57",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/ef120125e036bf84c9e46a9e62219702f5b92e16",
+                "reference": "ef120125e036bf84c9e46a9e62219702f5b92e16",
                 "shasum": ""
             },
             "require": {
@@ -6891,7 +6891,7 @@
             },
             "require-dev": {
                 "pestphp/pest-dev-tools": "^2.16.0",
-                "pestphp/pest-plugin-type-coverage": "^2.8.3",
+                "pestphp/pest-plugin-type-coverage": "^2.8.4",
                 "symfony/process": "^6.4.0|^7.1.1"
             },
             "bin": [
@@ -6955,7 +6955,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v2.34.8"
+                "source": "https://github.com/pestphp/pest/tree/v2.34.9"
             },
             "funding": [
                 {
@@ -6967,7 +6967,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-10T22:02:16+00:00"
+            "time": "2024-07-11T08:36:26+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php
index b8cf2e79..5304dc0e 100644
--- a/database/factories/PageFactory.php
+++ b/database/factories/PageFactory.php
@@ -2,6 +2,8 @@
 
 namespace Database\Factories;
 
+use App\Enums\Blocks\BlockType;
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Traits\FakesDatabaseValues;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -16,18 +18,16 @@ final class PageFactory extends Factory
     /**
      * Define the model's default state.
      *
-     * @return array<string, bool|string|null>
+     * @return array<string, bool|int|string|null>
      */
     public function definition(): array
     {
         $title = $this->getFakeString();
 
         return [
+            'webpage_status_id' => WebpageStatus::PUBLISHED->value,
             'slug' => urlencode(str_replace(' ', '-', $title)),
             'title' => ucwords($title),
-            'subtitle' => null,
-            'content' => null,
-            'meta_title' => null,
             'meta_description' => null,
             'meta_keywords' => null,
             'open_graph_id' => null,
@@ -44,29 +44,25 @@ public function aboutPage(): static
             ...$attributes,
             'slug' => 'about',
             'title' => 'About',
-            'subtitle' => config('app.name'),
-            'content' => '',
-            'meta_title' => 'About',
             'meta_description' => config('metadata.description'),
         ]));
     }
 
+    /** Indicate that the model should have draft webpage status. */
+    public function draft(): static
+    {
+        return $this->state(fn (array $attributes) => array_merge([
+            ...$attributes,
+            'webpage_status_id' => WebpageStatus::DRAFT->value,
+        ]));
+    }
+
     /** Indicate that the model should use faked data with all fields filled. */
     public function dummy(): static
     {
-        $title = $this->getFakeString();
-
         return $this->state(fn (array $attributes) => array_merge([
-            'slug' => urlencode(str_replace(' ', '-', $title)),
-            'title' => ucwords($title),
-            'subtitle' => $this->getFakeString(),
-            'content' => $this->getFakeTextHtml(),
-            'meta_title' => ucwords($title),
-            'meta_description' => $this->getFakeString(20, 30),
-            'template' => WebpageTemplate::PUBLIC_CONTENT->value,
-            'in_sitemap' => true,
-            'is_homepage' => false,
             ...$attributes,
+            'meta_description' => $this->getFakeString(20, 30),
         ]));
     }
 
@@ -77,11 +73,7 @@ public function homePage(): static
             ...$attributes,
             'slug' => 'home',
             'title' => config('app.name'),
-            'subtitle' => config('metadata.description'),
-            'content' => '',
-            'meta_title' => config('app.name'),
             'meta_description' => config('metadata.description'),
-            'template' => WebpageTemplate::PUBLIC_INDEX->value,
             'in_sitemap' => false,
             'is_homepage' => true,
         ]));
@@ -94,10 +86,7 @@ public function privacyPage(): static
             ...$attributes,
             'slug' => 'privacy',
             'title' => 'Privacy Policy',
-            'subtitle' => config('app.name'),
-            'content' => view('partials.body.privacy')->render(),
-            'meta_title' => 'Privacy Policy',
-            'meta_description' => 'Privacy policy for the ' . config('app.name') . ' website, which covers how this app handles your data.',
+            'meta_description' => BlockType::PRIVACY_POLICY->schema()['description'],
         ]));
     }
 }
diff --git a/database/migrations/2024_07_16_000000_drop_subtitle_content_meta_title_from_pages.php b/database/migrations/2024_07_16_000000_drop_subtitle_content_meta_title_from_pages.php
new file mode 100644
index 00000000..066d5986
--- /dev/null
+++ b/database/migrations/2024_07_16_000000_drop_subtitle_content_meta_title_from_pages.php
@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /** Run the migrations. */
+    public function up(): void
+    {
+        if (Schema::hasColumn('pages', 'subtitle')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('subtitle');
+            });
+        }
+
+        if (Schema::hasColumn('pages', 'content')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('content');
+            });
+        }
+
+        if (Schema::hasColumn('pages', 'meta_title')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('meta_title');
+            });
+        }
+    }
+
+    /** Reverse the migrations. */
+    public function down(): void
+    {
+        if (!Schema::hasColumn('pages', 'subtitle')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->string('subtitle')->nullable()->after('title');
+            });
+        }
+
+        if (!Schema::hasColumn('pages', 'content')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->text('content')->nullable()->after('subtitle');
+            });
+        }
+
+        if (!Schema::hasColumn('pages', 'meta_title')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->string('meta_title')->nullable()->after('content');
+            });
+        }
+    }
+};
diff --git a/database/migrations/2024_07_16_000001_add_webpage_status_id_to_pages.php b/database/migrations/2024_07_16_000001_add_webpage_status_id_to_pages.php
new file mode 100644
index 00000000..581f15c4
--- /dev/null
+++ b/database/migrations/2024_07_16_000001_add_webpage_status_id_to_pages.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /** Run the migrations. */
+    public function up(): void
+    {
+        if (!Schema::hasColumn('pages', 'webpage_status_id')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->integer('webpage_status_id')->nullable()->after('id');
+            });
+        }
+    }
+
+    /** Reverse the migrations. */
+    public function down(): void
+    {
+        if (Schema::hasColumn('pages', 'webpage_status_id')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('webpage_status_id');
+            });
+        }
+    }
+};
diff --git a/database/seeders/PageSeeder.php b/database/seeders/PageSeeder.php
index 31f7a992..77d28826 100644
--- a/database/seeders/PageSeeder.php
+++ b/database/seeders/PageSeeder.php
@@ -2,6 +2,8 @@
 
 namespace Database\Seeders;
 
+use App\Enums\Webpages\WebpageStatus;
+use App\Enums\Webpages\WebpageTemplate;
 use App\Models\Block;
 use App\Models\Page;
 use Exception;
@@ -26,16 +28,14 @@ public function run(): void
         if ($seeds !== [0]) {
             foreach ($seeds as $seed) {
                 $page = Page::factory()->create([
+                    'webpage_status_id' => $seed['webpage_status_id'] ?? WebpageStatus::PUBLISHED->value,
                     'slug' => $seed['slug'] ?? null,
                     'title' => $seed['title'] ?? null,
-                    'subtitle' => $seed['subtitle'] ?? null,
-                    'content' => $seed['content'] ?? null,
-                    'meta_title' => $seed['meta_title'] ?? null,
-                    'meta_description' => $seed['meta_description'] ?? null,
-                    'meta_keywords' => $seed['meta_keywords'] ?? null,
-                    'template' => $seed['template'] ?? null,
                     'in_sitemap' => $seed['in_sitemap'] ?? 1,
                     'is_homepage' => $seed['is_homepage'] ?? 0,
+                    'meta_description' => $seed['meta_description'] ?? null,
+                    'meta_keywords' => $seed['meta_keywords'] ?? null,
+                    'template' => $seed['template'] ?? WebpageTemplate::PUBLIC_CONTENT->value,
                 ]);
 
                 foreach ($seed['blocks'] ?? [] as $display_order => $block) {
diff --git a/package-lock.json b/package-lock.json
index c7bd4ee4..3259ec0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
                 "@ckeditor/ckeditor5-vue": "^6.0.0",
                 "@vueuse/components": "^10.11.0",
                 "@vueuse/core": "^10.11.0",
-                "ckeditor5": "^42.0.0"
+                "ckeditor5": "^42.0.1"
             },
             "devDependencies": {
                 "@inertiajs/vue3": "^1.2.0",
@@ -23,8 +23,8 @@
                 "eslint-plugin-vue": "^9.27.0",
                 "laravel-vite-plugin": "^1.0.5",
                 "postcss": "^8.4.39",
-                "tailwindcss": "^3.4.4",
-                "vite": "^5.3.3",
+                "tailwindcss": "^3.4.6",
+                "vite": "^5.3.4",
                 "vue": "^3.4.31"
             },
             "engines": {
@@ -65,456 +65,456 @@
             }
         },
         "node_modules/@ckeditor/ckeditor5-adapter-ckfinder": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-42.0.0.tgz",
-            "integrity": "sha512-d07ywmOA3ZwqL9tTT1c8oAScqqhA0Az8GC6HqIkPuSaCRKVC55aOLDkmPyACiHFkUkrhmCV9ldkVKoqptxRJVQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-42.0.1.tgz",
+            "integrity": "sha512-dfyULdo7vQDnFJWZfm0Qv6scW2TVnWLPEVo5r1D9knZbDC4zWFCmr0GeSjMHYKbtstPJzQ1QiVWKMFhWPvOeLg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-alignment": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-42.0.0.tgz",
-            "integrity": "sha512-hr1v5shN3D41EhnliLc5Svrg/JfyoKnSgnFLvejTYdd8HCyVqfiedgFCYP/goeSZTaGPpAIPojYdpQwtJON6+Q==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-42.0.1.tgz",
+            "integrity": "sha512-vy0SyqB1+SQ5ADZyyqZy4I4kD1SEVigFuCA+77IyaL9eDWvwZswwp+YuvnLRe3pZgPhCus1QMbxgbalhxnbhRg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-autoformat": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-42.0.0.tgz",
-            "integrity": "sha512-dGMwLPk4Q3Np/dVAOqwVefnS0dRGqARmcnV9lhpeC44mw+1ba3pxpCitxHkZY8epQHkLyhOuacWTPqSqAcB+bQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-42.0.1.tgz",
+            "integrity": "sha512-jJvtrbgtvbB4gcgWnAXIyHpb51i3dxY84Uwoc1KIRJyBeCX2vSoXKZ9frnQZp1r5r/MZfW0esuqyMHDI9R+TJQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-autosave": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autosave/-/ckeditor5-autosave-42.0.0.tgz",
-            "integrity": "sha512-Tqd8xbvjF6WTMl8R0QaCU0IW/TdqR1SlH/qXuLd+D96crCcXArRFdJ+oIjw6eJ436iI1Yp0aHzZb/KAnZ75Jww==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autosave/-/ckeditor5-autosave-42.0.1.tgz",
+            "integrity": "sha512-ogKO/b+Ckj1yJTkuhCUnsVXkgHztKcU8K8zmpN9+nZR+BHqPEsrw7zEYdQm6LQi3tARdEvDvItqehcGDi9MA8Q==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-basic-styles": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-42.0.0.tgz",
-            "integrity": "sha512-CWMlmdTilDMlMrTA4UzxkSIpxliafcAC6mp2doDkm3MZ1K6+YewHpcxHRuZAsBMYGkmQSLq0YcqdTnDXoICSXA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-42.0.1.tgz",
+            "integrity": "sha512-p//VnlaacNeMTOmWdSFQomrTsteXRACkwd8Fr1qTu/m8FT4x8o0S2+UMiIh+H2fkUz9kqfy0lm/BE/RKsBOjng==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-block-quote": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-42.0.0.tgz",
-            "integrity": "sha512-VBXHHHALhW+iBfyAiQxskV45ozVGuanKRNagVXHPba0QLIEa2JUN75/5RVZVw3qr2BqS1wUKCrbb4qHeF94Otw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-42.0.1.tgz",
+            "integrity": "sha512-pSh752pye2vp68DAnrUg+Evi1FlxbBK2zUjt2xT92WOrqpow9b1LYdmnZkeJayt271+ot1rowyNEm8v+uOZBHw==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-ckbox": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckbox/-/ckeditor5-ckbox-42.0.0.tgz",
-            "integrity": "sha512-QcfLRpherNotB8XxMzHYk+CeAcqNOHan5e+kBN+mOcPkIcsbapt7RPI680YChw/sv/0yY8/5SbvXdcsn+KCFzw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckbox/-/ckeditor5-ckbox-42.0.1.tgz",
+            "integrity": "sha512-1URxhD1ejokpsTUyD+s8aoZkejBh84402sfwLTXnF6oF7Fd6XpFwkW7u3kRQVgkP88d+BeT+SXUw9230IODD5w==",
             "dependencies": {
                 "blurhash": "2.0.5",
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-ckfinder": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-42.0.0.tgz",
-            "integrity": "sha512-P5hCrP4EPWRdIg7vXh2PjpovWq1SLgfjRCqC+a9hs5q/W3nYc+SIZbawJOV/kr5eq/E1O4e2flehGG7Y22AKVw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-42.0.1.tgz",
+            "integrity": "sha512-tZx2UNBblgRhJEP+ZylAOsp8DT8lvmpjxnfQWgh9RKhzrH13b4cIjN+7lbDNVLtuniCz0aSR7dHnWBrl9TxUOg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-clipboard": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-42.0.0.tgz",
-            "integrity": "sha512-/ajaQ5q0auwNsZEX1rveGQ5lBpeuhWWAVo/Ouv1IJT77G6nFDubqlYcKZEidGne2v1wtIgDK+nddnlxVdX8tvQ==",
-            "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
-                "@ckeditor/ckeditor5-widget": "42.0.0",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-42.0.1.tgz",
+            "integrity": "sha512-+NN8dqdskyrtkjdv5NXZqO1VvKlGvQh1+kC/PqAuBBB/mGNVHBXnUmV3RoIFHBv3C7YolW3ltwjQduz71Ay25A==",
+            "dependencies": {
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
+                "@ckeditor/ckeditor5-widget": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-cloud-services": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-42.0.0.tgz",
-            "integrity": "sha512-PfH3PPB9fkweXSBfHzTbsHP/jEfDmkueGKGVkO7Z/luCASWjtNfQypykkkrDnMRv1PMJmBnK9wheWEGqBoS4kA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-42.0.1.tgz",
+            "integrity": "sha512-nzwJKgWR0SFXV1b4pkxnOZelk2aXWxiaAmMrF4jZV8F1pTVsU3/SKxBbqhZxQZFImi9xhAGdka6QrIwEquIq1g==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-code-block": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-code-block/-/ckeditor5-code-block-42.0.0.tgz",
-            "integrity": "sha512-RsXWRo6pbI2MsMHE+AE03UqEHgzErj/EO1lQy4vqgNNHqhXWqjMQZo4WSnzboczHRjNi3cNNFIw6r4nqm1Yz9w==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-code-block/-/ckeditor5-code-block-42.0.1.tgz",
+            "integrity": "sha512-Ix35lRf/gS0sLPS3QawZYfnyT8TtEwTW0kfg/lhx7z+lTXmjlR7cAVAeIDrP3uQnASEydyIWHkqlzp9le0HjGA==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-core": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-42.0.0.tgz",
-            "integrity": "sha512-0WZTQM4JD3qobXNTPRMq0o1t+vYRWzkzX0LwoooZVn7NKIqCrYqVsTuV0xsN7qT0vdFNRvA9TYYfinw7j9Y4rw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-42.0.1.tgz",
+            "integrity": "sha512-a/Lftjxi/jFiBM8l9/VI7qNqiTgGSqed4FGua1RFfE35v6goOsfFhIPkzT9sTXJL5ZDj7Zjrh/RrOc3jKzjdPA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
-                "@ckeditor/ckeditor5-watchdog": "42.0.0",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
+                "@ckeditor/ckeditor5-watchdog": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-easy-image": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-42.0.0.tgz",
-            "integrity": "sha512-Sb0DxfeN/BSq17ITkEoiCNMIqVcpV4JvNzDe7NlYnzmo6zL5HLX8Qd/fQAV44MrTZY8Lifkd4zqFSmSCcCZC2g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-42.0.1.tgz",
+            "integrity": "sha512-l+1Pa7K5DzCL6d5+3nwDPYEUxC92pkfRQGn+LDdfjXg3kCyRexP5FasFrRCwuNmZRjws+B8gzLoTS1bRCrWB4A==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-balloon": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-42.0.0.tgz",
-            "integrity": "sha512-tTszKMob0WO7J3xEIi2GQxtDgY19dUTcGHBqpMRE2bcGTUKeeeqjfJwnNww/kDjYR+e4fmz9U5VRVg8PKQZVqQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-42.0.1.tgz",
+            "integrity": "sha512-gZ8rFF7NbYUsNfHY4I2QYbHvfoQiGu1puzflZ7vPEiu/q09E8W5TtYwRTaWDXfIwLP4RbpXBKb4xnArThdrFqw==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-classic": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-classic/-/ckeditor5-editor-classic-42.0.0.tgz",
-            "integrity": "sha512-/Np+DH2AVlkPVk3pkIJxJaJp2x+2GXkvn3wo/5ZFGbVBXI+e9todALoRRg2dB9EVRpv08I3ajzk5k1yl6MFa5w==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-classic/-/ckeditor5-editor-classic-42.0.1.tgz",
+            "integrity": "sha512-WASM6IXZED1uTvbWtLAgkga9JCVITvWGgDVAJgAYD6+7a5F2iEqxdegoV4duSr0qWhhzFqeRpey8mLrUi9VYwg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-decoupled": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-decoupled/-/ckeditor5-editor-decoupled-42.0.0.tgz",
-            "integrity": "sha512-bTgtSsu2f7QOMtWXZ2BQvnZ/DHRQE/wL9qN5MBhTbNf7vcayEEo++GJ/3sgLctzL7FxRCY0IqRvSrBf4fLFEZg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-decoupled/-/ckeditor5-editor-decoupled-42.0.1.tgz",
+            "integrity": "sha512-IR/ymKv813b8lVcFtKA6jGBvSTyc8UMOr/5yTCmvUYGBYjD39wv4QQpj4AClbbVL8CPNxUAToexLxelhjc1cgQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-inline": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-inline/-/ckeditor5-editor-inline-42.0.0.tgz",
-            "integrity": "sha512-JUe8YV59Ek4lornaa5hXQQOFkDxA3l0tp9qVIdkl2WONI1pjtK1aMxWJgeybxRGDHPSJW2Wyu/kNKw2slQP+Jg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-inline/-/ckeditor5-editor-inline-42.0.1.tgz",
+            "integrity": "sha512-A2qd/hcKpeIxRubyWLK2TZhPPCvZsDJerySSAzw6fFpAgedlBV2Lz048tV3AJholhwlFsITuaNyna/dTVE6/qg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-multi-root": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-multi-root/-/ckeditor5-editor-multi-root-42.0.0.tgz",
-            "integrity": "sha512-l/+xnoVIGJeX3qU8CEKdc5RNr0Bbch2t5VNNK+N9An4SrK4ScLESyrKsIoWc4XPOoyhNe1j0luT8Ix35ftDroQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-multi-root/-/ckeditor5-editor-multi-root-42.0.1.tgz",
+            "integrity": "sha512-IDU22zezBwM40/ofeAloHGzbghQxPlKW21h6XYs1RmKJLzq87BuxiZ4KY8hJkg9asdZrw4gU7YS20570QvjBjQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-engine": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-42.0.0.tgz",
-            "integrity": "sha512-9JhZDAu+IAJYD3SCrssrDU9XmEYfu+1XtYKslNlXRweNIf5QlVeZhb3pTjcR/4lbxNuYXc/VSNsFfEjbPKm1/g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-42.0.1.tgz",
+            "integrity": "sha512-hI7qVWVYYcfCeJ846Kjbbam4VnYYG93XDcL2SXKcyCgtuiJPiQroL7tvfSKTvBn2KZR2SwpHFfPkm5QXrZP+Xg==",
             "dependencies": {
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-enter": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-42.0.0.tgz",
-            "integrity": "sha512-HlSMX9jYZ1fob5L5+dJ7dmYxJT2RVzgO95IeMXvbsSMEQ5IC1ZhE8UIcaStNTUZ7SNQzhcX6cqUrPO8Zhh46xw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-42.0.1.tgz",
+            "integrity": "sha512-HuROcF33ekLzR8Uuc7tkonZqxEcpQ37pkd1Rx7V6JCt60rapm7cpELKl3nxDDyPUh+cWZ2nM6iQh/vsvXZkSKw==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-essentials": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-42.0.0.tgz",
-            "integrity": "sha512-DYWrEcraXiw+S9lbAk3UfvOnSe2ActOchk15hTishQKhRBzPqLDWr8bTYy4TwgwaMJg1gW9KK5o19oHLfW0P3A==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-42.0.1.tgz",
+            "integrity": "sha512-+hjE9KMCIsmajNmWVdUYpx27CogUry1g674VJ6he9QaFqrVsfApihZD98Zgl1QfoDdaCFnBpI9W/PE+2M1veIw==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-find-and-replace": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-find-and-replace/-/ckeditor5-find-and-replace-42.0.0.tgz",
-            "integrity": "sha512-WrScnK58umy8LqGpYvQieJd8mgo9yYKVoG0KnDrlj+Q2hZhGqta5jt1CRlYOQLO2QsVg9POt6oioUTiWee60ag==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-find-and-replace/-/ckeditor5-find-and-replace-42.0.1.tgz",
+            "integrity": "sha512-GhjbzZIJ6aVfbQyCfru6jGTv1A3tmNcWs/YncSewZFb1Xxgk9EkfPcynB+hG3X8X38bX8ggvbxoicRFGKqzLHg==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-font": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-42.0.0.tgz",
-            "integrity": "sha512-7ds9luaUDdHrmdZ6JKPn82+DkJAJ3Ej5Rdta8xfcnI1kDvGcLPRzwPCHeM5AD8RRqHX28B87U4FaOk9ehOE+Nw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-42.0.1.tgz",
+            "integrity": "sha512-5TEbQvvrQn45S+08ancAFFecv8BWvC2L4nIxPKKYikOsFNScE6C5nxrr/Xaa98ZEgHowp48z+yZxLjTDwOZctQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-heading": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-42.0.0.tgz",
-            "integrity": "sha512-KLquk1q0yOjw9rGgq+beigc3uzIk5+5fq1VJCfyeq2qkrLdezWf21Up0h8zCBjJGt4Dw7jodJyMnK4GH3885Xw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-42.0.1.tgz",
+            "integrity": "sha512-Uf6IlamcgnZn3VkliP4+qWxEFKdaZNGfCntU08oW4b0Wf3i3P7lbBz73ZQ1sUF79QWZVlZiMIuQNL5RjAc93eA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-highlight": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-highlight/-/ckeditor5-highlight-42.0.0.tgz",
-            "integrity": "sha512-aWEv0yHVmzj9JRpXnURWSs64lphei+Bc6PbiecpQJvidjmFSgmVO0pFGtHe+iMmGy7S4TTGnPVEnq4IS0gGdgQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-highlight/-/ckeditor5-highlight-42.0.1.tgz",
+            "integrity": "sha512-mUvnfdX6HYa7kbsfDILLCX32Ia4lFDfOQm/mx5gR17hxbv//u55jZESKwvwNwUBoYXzln/hg2ifqoPFTFuC/aA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-horizontal-line": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-horizontal-line/-/ckeditor5-horizontal-line-42.0.0.tgz",
-            "integrity": "sha512-9YIYENX3YM2WXLItD1rqMq+Lqc3daRT4E18C2FXgfrMUQNYDyM5UFzsi6HahjvRe2pbYOx0MwYGvaHgSjBVsCQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-horizontal-line/-/ckeditor5-horizontal-line-42.0.1.tgz",
+            "integrity": "sha512-nw99pQ3dgm9G/M88UDtcvVUy3Xb6+baLz1IvanfItgVrH8FFObICFZjNJWxd/H4xtbQzMz1Ty6w8ZocPWja9sg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-html-embed": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-embed/-/ckeditor5-html-embed-42.0.0.tgz",
-            "integrity": "sha512-nh4ROlPU6enn9uOYigOsJHegnZslVs3UYOhLsod2JBOB2spF0AcoqOtk/Oh6SLajDa0iZ+oi1U7iNxXvekcysQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-embed/-/ckeditor5-html-embed-42.0.1.tgz",
+            "integrity": "sha512-MEim8XV+75aEnDGRkrft15oURiyVEOvHo9h+7cFeE3hgI9+wjk/V3arHQIAUkZTT3XpRv8LQKjBC1hmXTz7YyA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-html-support": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-support/-/ckeditor5-html-support-42.0.0.tgz",
-            "integrity": "sha512-HPwiaz9Ah2BjuS2UgLdYv+APo+k0HJG79M/dgC3rNLX0O3IoWBDBXfcRhWKiGE1FBV3l1jt8eQgnaqsuKC6PIw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-support/-/ckeditor5-html-support-42.0.1.tgz",
+            "integrity": "sha512-RxWl+RyfBSpa9setDWmtoF3ertzVOmaLi7Aw7xnyn71jV+S3aCMlZphiv7m9KENNy46FOc+Nzct5sScnJ+EpVg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-image": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-42.0.0.tgz",
-            "integrity": "sha512-lKq4OuhLDNS4sip4/yl/vGDuOitTCInMYEhvwZXlm6eFem75FTJnL1Co5+zKIVWktWvH2eFqmOGjv2jKrJIVgw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-42.0.1.tgz",
+            "integrity": "sha512-O1u27JxByLNgZpmwP3up6lh48IU89w/7rMvd9WByQCyZpUPTT2J/4Mvjlimq1AMt61qmzx08TdcfhI+8aRhBvA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-indent": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-42.0.0.tgz",
-            "integrity": "sha512-Ba7cTreIEFoF0mJXRjBZdwgyzSvdmnqtlwMInM/IBIJDo6Vi4zx4svA2G1PvY/hV3UCvCAxzSqQ7s62yQT4KEQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-42.0.1.tgz",
+            "integrity": "sha512-aT/ui69ncvXFv/9TJqe3TUegppH62b2E9XaQqfwCmm1jZ5BDEG8oYnJI1htnsnmQSOXqye7m5276F+47nrN42w==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-language": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-language/-/ckeditor5-language-42.0.0.tgz",
-            "integrity": "sha512-x1cFYKtxBz1dhWXZ6DGvegCks7st6N1jFL55kyDgkvZqjsui/aPSvHnrcT6T0UO2sjMwAJh5/be5PXAJJ1yL0g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-language/-/ckeditor5-language-42.0.1.tgz",
+            "integrity": "sha512-iWmfEySQqDzNT8VN7qh8yr8tzUjrUwjYuYV2yvggNHPMo66JoRGsJwwZDYcdx1tOzIhcxOtZnQLK3v34k0gNQg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-link": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-42.0.0.tgz",
-            "integrity": "sha512-myphicJKjwv1LZ0pFdd1u4VOQieonPoNezRhsrFBkLTqIADgMp3+2PETyls5W8JZnua4sg/724Wa9TPmn9BLAA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-42.0.1.tgz",
+            "integrity": "sha512-SaLYdmAknaMgX9ABxafMUmJ7a42IgKZQU58+wwwD+gWmaXt/vmWSCSbe1q6+e49UejnBMC4NCDC6YaQWAiTrIw==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-list": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-42.0.0.tgz",
-            "integrity": "sha512-taBQvwlhWmzFGGxOa5QH+XFeFRPke2X+3L/bdp/PJb9ZBX/wuqDL/cECQwDjblbGG8Iu1pDBOZSMG/bIknZjog==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-42.0.1.tgz",
+            "integrity": "sha512-yEzFuO28msXm8I65lpF/D6eWLDK6ZsWnKsYDcQI45QlsVGxrs9r0t4mJzmHv26lN4p4/2pv5CPM1w1+ovvC6Ww==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-markdown-gfm": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-markdown-gfm/-/ckeditor5-markdown-gfm-42.0.0.tgz",
-            "integrity": "sha512-wtNpAkBiyobHbeLpsnnf9aroSIIjvKYsNxeNqB7P55ZyRN+mLdGQxp2ozPgCIjeb34SaalJ1VtiRnPS+B+NbaQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-markdown-gfm/-/ckeditor5-markdown-gfm-42.0.1.tgz",
+            "integrity": "sha512-P2ihM9c3cVDeCdrVk3JoTmG3ApJZgbYy1Iag1rcoLyVW185nn4H3rkPBVSVFfa1+B9lw0Oe50YcPv67mIWe8VQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "marked": "4.0.12",
                 "turndown": "7.2.0",
                 "turndown-plugin-gfm": "1.0.2"
             }
         },
         "node_modules/@ckeditor/ckeditor5-media-embed": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-42.0.0.tgz",
-            "integrity": "sha512-cbaTwnnNC8Li497WrArw4BcENQcv+b7FH7Q93bjytQN8vrxZR8+eWfCHbaR8dNewAWLI4/jNp9S64koOMOhUTQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-42.0.1.tgz",
+            "integrity": "sha512-OnaZb8LdXKS7jyWRSInXFtA/u+t9KcSJAO68MxRnI1bkUdegudaj4JzXX7/ifIocgFTdG+QlG+v40PAUfXYTkQ==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0"
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-mention": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-mention/-/ckeditor5-mention-42.0.0.tgz",
-            "integrity": "sha512-6jC5vGfHAeYarmgecw4cWj7u1E4EgFZlQh6Z15WcQ2OeHTiBLh1fGFPM10gKauIYfUsmHfsVFsafGyByFQsZBw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-mention/-/ckeditor5-mention-42.0.1.tgz",
+            "integrity": "sha512-lrRSMHtbo6kuKzfoUk7D5hb7IQaFnDtTsePk7k7kkg22T0yCzxeJwmd314dAZfcNf5D49izvg1RucpquJ6XS4g==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-minimap": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-minimap/-/ckeditor5-minimap-42.0.0.tgz",
-            "integrity": "sha512-cTbZqve6xYh5D4XSecU1AEx5Rl2gRm2U91G3O53GddhuScG9tchmZ2n3kzFz6FkDcYpgWJBLK5uEdSBede+YeQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-minimap/-/ckeditor5-minimap-42.0.1.tgz",
+            "integrity": "sha512-OGdFguNeEVUh8pUF0VCAEkbM5QIiQJW9KPWc+wLJyhSMnLV4J9abI1vBalTD/C/obD1g/gKtGu3jhxNk1YMEOg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-page-break": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-page-break/-/ckeditor5-page-break-42.0.0.tgz",
-            "integrity": "sha512-2Bg4cAMBs1RGIMn0CZSnADSG+Zn19u0/qMfxR5Js5AolMjsMFcvfHVHrP7WTPfYKz0S0F9LLWTEjyf3f6PU3Og==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-page-break/-/ckeditor5-page-break-42.0.1.tgz",
+            "integrity": "sha512-bCRTEh2giOIidDjjBI+xK8TJ0QvXLtahDEV7MmecAeXu1SAk2FpECl60BUMl+/DQcaK3XGHsLZCMZsSdCXGqbQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-paragraph": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-42.0.0.tgz",
-            "integrity": "sha512-CNEc+YBDD5vysMxzSkCRXNtCeWJH2Drq2ynFc6YAOVXnfAQvpW3PnuwHMUQvS6r1BCk35xEbUpuRLCXxOuoipg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-42.0.1.tgz",
+            "integrity": "sha512-rxGX+vnrxUGpTXZQSIO5XBP2Cz8CaYyufLF8Ad4fTpT6VT++BAczI0r2ij5SZLK7iCKQfHBrzz1BvatJmxjr5Q==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-paste-from-office": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-42.0.0.tgz",
-            "integrity": "sha512-pfBOovJz+CnXXX4XQLJQTBRWHTnlG7gibzzMnnmK+KIzsjlVOGrl09c2uafQo0QvgNSH0bF6Yhxn6T2CTCWcYw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-42.0.1.tgz",
+            "integrity": "sha512-OKeWTHPrt7Yjp+rzZomxYmhEqZRQmGy+YGkWCdnfy2CH4ypsQVLI07hZazuZ8ZNVZ+/P7gxD7m+1y6EOj3SC5w==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-remove-format": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-42.0.0.tgz",
-            "integrity": "sha512-lS/fEoSM2HOhA+Ocve3gwRjlqKhZQx5Rbm3PBzAQJAZosfxCeCLcg2RJb1zGD4mGsY2urWAeRVNNckJObcNM9Q==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-42.0.1.tgz",
+            "integrity": "sha512-j1VpxnMRqSEDr2nzY/JGjvd+wYFqw2VJrTLA/2hmkH40BhdmCw8+t8AFLUNUPqBE/vGTHbMVvmf4vRhy/nM2Rg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-restricted-editing": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-restricted-editing/-/ckeditor5-restricted-editing-42.0.0.tgz",
-            "integrity": "sha512-5WnyJ+rLbh206Y3XbOxNKxpdNi9X4nE+O/Pk7TLgvkZ2S4UdptplaycXk9mTHZvtRWCs1VLW629WoEoHXPGtxg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-restricted-editing/-/ckeditor5-restricted-editing-42.0.1.tgz",
+            "integrity": "sha512-lgLucIp20Z6P6sUX1sH9fQiqbGQ0t/yBNoMhi340T9ejBjIfRQ2sJyvUelInD5XICrwdU29jPBcGD0VqWBbFBw==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-select-all": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-42.0.0.tgz",
-            "integrity": "sha512-6tnRtB5TIsgUh6I+lahvIYxsL61M+b0XvLQCPpIiYHn+V6htEESoniz7vVxEgwNXnCuCFoHvO+IpjC6ugd0ESA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-42.0.1.tgz",
+            "integrity": "sha512-1PymHaP/0lEoTVrxrNzCY/36QsKqV/mKcXm5zwNwRdLgY8GB2tcu75YthubG8sVHNR893IMG4FYlGS/a1exwIQ==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-show-blocks": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-show-blocks/-/ckeditor5-show-blocks-42.0.0.tgz",
-            "integrity": "sha512-ZQ/u1/7fU2ZA57q3i6yTsHSgzAPQ60uK49/R/zQYCQsAzxGXavvQ0qOwbpzaR1O+y942w1n0E5roXyTelTHaPQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-show-blocks/-/ckeditor5-show-blocks-42.0.1.tgz",
+            "integrity": "sha512-mdmytIO/GslWrCt8Cubt2TsHOogio+/0lTjk76LtPIJn+AUEI4xYhPIZfFOHbxqzjVx2tx9g49Sr+S/SA2Ag9A==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0"
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-source-editing": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-source-editing/-/ckeditor5-source-editing-42.0.0.tgz",
-            "integrity": "sha512-p2KtKpcX2vuPNA85n5mQRwouEAWGqFpXiblMCdDtp8Ajql1EcGa66edOP8qeyT1CpsJ6PM/sZ86otKKGTFl4yQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-source-editing/-/ckeditor5-source-editing-42.0.1.tgz",
+            "integrity": "sha512-6b5ujT5smdpB+2rZbGM7Isqgevs/any+PsbEtbBT7dc9NkkPI/2YH+o4a5FLf38c7fDxGCV4Ob7kwOPStkNAIA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-theme-lark": "42.0.0",
-                "ckeditor5": "42.0.0"
+                "@ckeditor/ckeditor5-theme-lark": "42.0.1",
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-special-characters": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-special-characters/-/ckeditor5-special-characters-42.0.0.tgz",
-            "integrity": "sha512-WXKjyCE4AZG0yWRkRI3EvoYU8L+U1Ckz9cdeUEpPC7MFBZT2o28pGDyE8jzjmt51tOIZUNuSnwUCF1+kRn+xKg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-special-characters/-/ckeditor5-special-characters-42.0.1.tgz",
+            "integrity": "sha512-irWFRCpZODtB1ui3Wm214Es6jxFNDZn/e1mbhGf5DGOGEQCLe8aAJc68FDKI3hl8cQlXxDTSch1RFvUiuNaBIA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-style": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-style/-/ckeditor5-style-42.0.0.tgz",
-            "integrity": "sha512-0WaRKAuslHEpmwz+ebQYAwmH047QPt0Kp2XiXxvbVyeSgpmX6c8AzbrkCT11kGCpC1VEdiqg8AkroPQCO+VDnw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-style/-/ckeditor5-style-42.0.1.tgz",
+            "integrity": "sha512-JVO8Iq9j15iABpHTt24T8KsdDf2KxVFe7gg0ooowlZB7CmmYVCqKBGnnMemqM+aQk3qfXPUgNA1G3v259MHs9g==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-table": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-42.0.0.tgz",
-            "integrity": "sha512-D3RwXDIsUX8MGUfg2bpcfObF0seYUllqW0aMalPPcpKVwO9Yjh98FXi8CQyrLp7Ig7ef8yFQv6I5y38Gze8Utw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-42.0.1.tgz",
+            "integrity": "sha512-xITEPFvV05h+sNbs2jqLSUu6UUat5DCoyt9WIbqIYC8hwJrGGAcuwldyfL0e+hrUAbHHkL1K9oRlMmhKuw6OEA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-theme-lark": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-42.0.0.tgz",
-            "integrity": "sha512-G9rda0cxoi2qrTxsUQyOTnj8cH/66ZRPYd2v2cCuWxfjkNELzqjWtl1e9v5cQQvUrxcp7gPCTOtvc3lchdD5tg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-42.0.1.tgz",
+            "integrity": "sha512-EZfxuFpBro6VTobQytGkvMQl/H8PymANTQrnICwLEKd81ZM5yJQTeolF/VS+QFlDqx1gXUESNJt8NqFytm1cww==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0"
+                "@ckeditor/ckeditor5-ui": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-typing": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-42.0.0.tgz",
-            "integrity": "sha512-6FDkdEDrWKBnEX+C4qqQ2j5VD26Z+VBr2vtprYtRykRCYpc/n4pbbz9ecjXnJ/E8ftm44nCMcBxbg8HPEjroyw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-42.0.1.tgz",
+            "integrity": "sha512-gLqp27CiLZe/ycKgJotqQ5Ta1KX3aSlZMYmnHurmOmkvjXB76syM990KlPiDAkff2QyXE1qgg0uKLgT4CbrKNg==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-ui": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-42.0.0.tgz",
-            "integrity": "sha512-Z69x9u8UkUP7P1F6u7loUGXqUiNtEXBz+2flXHxBq6JVnGh5rZ3ZtVhWQRaOSAIVp+ub/BwEcwzqq4itI1Tuog==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-42.0.1.tgz",
+            "integrity": "sha512-3OF/nm/pc8rwH65+GYET5Xj5qk53aVXnBi/DBVRQZBdhuAGlMQuy+7E2WU6vO7G24w1LOJUSPpeBJt/MXs6z2w==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "color-convert": "2.0.1",
                 "color-parse": "1.4.2",
                 "lodash-es": "4.17.21",
@@ -522,28 +522,28 @@
             }
         },
         "node_modules/@ckeditor/ckeditor5-undo": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-42.0.0.tgz",
-            "integrity": "sha512-7H4hD4k0jmrSk5n1cYKlj2rmuICIwdGFX3WMPv2KuEKI1WYZBE10KLf6bB15EFoMVvBFepX0TjfEVXTO6Ul5rw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-42.0.1.tgz",
+            "integrity": "sha512-3tIj7JLtKFMxiJrfZ7IrBXBzBe0dtP+EcztjzgQbndS1PaAldErH3g7z55avwp6R3hum0wFnqgvQRIgSUlYONQ==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-upload": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-42.0.0.tgz",
-            "integrity": "sha512-UPRre84p6qPyPVhDsfuVh5rNGcaZjSIQhGdqOPfgMWc4QYOKNf7Y7TvW+9xzUVXyHbo2pcvOq6/Ldw6z4zk10g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-42.0.1.tgz",
+            "integrity": "sha512-0tn4ltiz0cTmlMPFPpJkDzi5+jVkPbtv9R9OHGDFgDW0uyN93UvnW0xPpoXKn/R/qRJf2gnPK95QlUaeiz33+w==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-utils": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-42.0.0.tgz",
-            "integrity": "sha512-9f3eAjh7sgYC+Cth0yEHaWBJpPFWWehPa3efAlSjuKl0NhW2mzSU5s9SMRNDS5MJAI+oTIOLP5/SV/pNCbiT3A==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-42.0.1.tgz",
+            "integrity": "sha512-gJlP8/dCfnmcgq1E30//rd5KU3EetuFx0QQqphuaeUxuJeVhRJlMvva0H/dZOv82uMrTBgspxYsRrkjn7XnVxQ==",
             "dependencies": {
                 "lodash-es": "4.17.21"
             }
@@ -564,33 +564,33 @@
             }
         },
         "node_modules/@ckeditor/ckeditor5-watchdog": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-watchdog/-/ckeditor5-watchdog-42.0.0.tgz",
-            "integrity": "sha512-rNk1GtiIx6KYaE/B4atNOb7QNB916RbFfq4MsOPPVow+64XF3Ljvx14qX1I/da+WH3EbpoBwbJqnIlu7aLa0Ww==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-watchdog/-/ckeditor5-watchdog-42.0.1.tgz",
+            "integrity": "sha512-ROfjUFky3W2u9F+6sXiT1IR9pa/odYAjT9ck/wp5W2dHum5XMIAdF4A6bEwXeBtZnpMo8+tQ1b1OZv78rZ31IA==",
             "dependencies": {
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-widget": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-42.0.0.tgz",
-            "integrity": "sha512-HbPQCCwsBfRWSHOM0Qn1MFvlAym1S3XvQzqe7tEPZ577RLSk0H4FEvv6YxpUNjsjujYlDsUK+dF8zVye7Cv7tw==",
-            "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-enter": "42.0.0",
-                "@ckeditor/ckeditor5-typing": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-42.0.1.tgz",
+            "integrity": "sha512-hz02QxOFw4HNmDqM6369rCZgEotsmUtHcysC1Ius6XxbPiZHLraagb2wG9Dts/80DRN//1zGbxKG61sTa/5Bog==",
+            "dependencies": {
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-enter": "42.0.1",
+                "@ckeditor/ckeditor5-typing": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-word-count": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-word-count/-/ckeditor5-word-count-42.0.0.tgz",
-            "integrity": "sha512-+P8Q7hWdkq+sTt2+qAgz+OsOsTTdqluyYgrKRx9DvjLRsF+VmlHwNTaOMqcnU1EWNfFcjevQHoTugmqm+dWquQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-word-count/-/ckeditor5-word-count-42.0.1.tgz",
+            "integrity": "sha512-hTTCMmWTORGLj4f83DeKZC0d8K4JmOJHCCzAQypPIB1qD2n1D6VbweoVsgVOUr5fPsd5QO5jOyor2T2yHyQmyg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
@@ -2185,67 +2185,67 @@
             }
         },
         "node_modules/ckeditor5": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-42.0.0.tgz",
-            "integrity": "sha512-l/Qdw61+nAhkNfXRzPp3a6W75XGnKBKWlJqEbgMGclgAvaqgWE7MAz9VqQCJSeMK8PjgFH1EcBMPRmG+6W8QRQ==",
-            "dependencies": {
-                "@ckeditor/ckeditor5-adapter-ckfinder": "42.0.0",
-                "@ckeditor/ckeditor5-alignment": "42.0.0",
-                "@ckeditor/ckeditor5-autoformat": "42.0.0",
-                "@ckeditor/ckeditor5-autosave": "42.0.0",
-                "@ckeditor/ckeditor5-basic-styles": "42.0.0",
-                "@ckeditor/ckeditor5-block-quote": "42.0.0",
-                "@ckeditor/ckeditor5-ckbox": "42.0.0",
-                "@ckeditor/ckeditor5-ckfinder": "42.0.0",
-                "@ckeditor/ckeditor5-clipboard": "42.0.0",
-                "@ckeditor/ckeditor5-cloud-services": "42.0.0",
-                "@ckeditor/ckeditor5-code-block": "42.0.0",
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-easy-image": "42.0.0",
-                "@ckeditor/ckeditor5-editor-balloon": "42.0.0",
-                "@ckeditor/ckeditor5-editor-classic": "42.0.0",
-                "@ckeditor/ckeditor5-editor-decoupled": "42.0.0",
-                "@ckeditor/ckeditor5-editor-inline": "42.0.0",
-                "@ckeditor/ckeditor5-editor-multi-root": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-enter": "42.0.0",
-                "@ckeditor/ckeditor5-essentials": "42.0.0",
-                "@ckeditor/ckeditor5-find-and-replace": "42.0.0",
-                "@ckeditor/ckeditor5-font": "42.0.0",
-                "@ckeditor/ckeditor5-heading": "42.0.0",
-                "@ckeditor/ckeditor5-highlight": "42.0.0",
-                "@ckeditor/ckeditor5-horizontal-line": "42.0.0",
-                "@ckeditor/ckeditor5-html-embed": "42.0.0",
-                "@ckeditor/ckeditor5-html-support": "42.0.0",
-                "@ckeditor/ckeditor5-image": "42.0.0",
-                "@ckeditor/ckeditor5-indent": "42.0.0",
-                "@ckeditor/ckeditor5-language": "42.0.0",
-                "@ckeditor/ckeditor5-link": "42.0.0",
-                "@ckeditor/ckeditor5-list": "42.0.0",
-                "@ckeditor/ckeditor5-markdown-gfm": "42.0.0",
-                "@ckeditor/ckeditor5-media-embed": "42.0.0",
-                "@ckeditor/ckeditor5-mention": "42.0.0",
-                "@ckeditor/ckeditor5-minimap": "42.0.0",
-                "@ckeditor/ckeditor5-page-break": "42.0.0",
-                "@ckeditor/ckeditor5-paragraph": "42.0.0",
-                "@ckeditor/ckeditor5-paste-from-office": "42.0.0",
-                "@ckeditor/ckeditor5-remove-format": "42.0.0",
-                "@ckeditor/ckeditor5-restricted-editing": "42.0.0",
-                "@ckeditor/ckeditor5-select-all": "42.0.0",
-                "@ckeditor/ckeditor5-show-blocks": "42.0.0",
-                "@ckeditor/ckeditor5-source-editing": "42.0.0",
-                "@ckeditor/ckeditor5-special-characters": "42.0.0",
-                "@ckeditor/ckeditor5-style": "42.0.0",
-                "@ckeditor/ckeditor5-table": "42.0.0",
-                "@ckeditor/ckeditor5-theme-lark": "42.0.0",
-                "@ckeditor/ckeditor5-typing": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-undo": "42.0.0",
-                "@ckeditor/ckeditor5-upload": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
-                "@ckeditor/ckeditor5-watchdog": "42.0.0",
-                "@ckeditor/ckeditor5-widget": "42.0.0",
-                "@ckeditor/ckeditor5-word-count": "42.0.0"
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-42.0.1.tgz",
+            "integrity": "sha512-qgsv/eP79OKunE76mMyPP1/PPjsBkLUlmb4cR/TA5C6HGsMvrCmYhryIgvdcqnZ0k8OIre1/X50+3VWvMnJ2qQ==",
+            "dependencies": {
+                "@ckeditor/ckeditor5-adapter-ckfinder": "42.0.1",
+                "@ckeditor/ckeditor5-alignment": "42.0.1",
+                "@ckeditor/ckeditor5-autoformat": "42.0.1",
+                "@ckeditor/ckeditor5-autosave": "42.0.1",
+                "@ckeditor/ckeditor5-basic-styles": "42.0.1",
+                "@ckeditor/ckeditor5-block-quote": "42.0.1",
+                "@ckeditor/ckeditor5-ckbox": "42.0.1",
+                "@ckeditor/ckeditor5-ckfinder": "42.0.1",
+                "@ckeditor/ckeditor5-clipboard": "42.0.1",
+                "@ckeditor/ckeditor5-cloud-services": "42.0.1",
+                "@ckeditor/ckeditor5-code-block": "42.0.1",
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-easy-image": "42.0.1",
+                "@ckeditor/ckeditor5-editor-balloon": "42.0.1",
+                "@ckeditor/ckeditor5-editor-classic": "42.0.1",
+                "@ckeditor/ckeditor5-editor-decoupled": "42.0.1",
+                "@ckeditor/ckeditor5-editor-inline": "42.0.1",
+                "@ckeditor/ckeditor5-editor-multi-root": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-enter": "42.0.1",
+                "@ckeditor/ckeditor5-essentials": "42.0.1",
+                "@ckeditor/ckeditor5-find-and-replace": "42.0.1",
+                "@ckeditor/ckeditor5-font": "42.0.1",
+                "@ckeditor/ckeditor5-heading": "42.0.1",
+                "@ckeditor/ckeditor5-highlight": "42.0.1",
+                "@ckeditor/ckeditor5-horizontal-line": "42.0.1",
+                "@ckeditor/ckeditor5-html-embed": "42.0.1",
+                "@ckeditor/ckeditor5-html-support": "42.0.1",
+                "@ckeditor/ckeditor5-image": "42.0.1",
+                "@ckeditor/ckeditor5-indent": "42.0.1",
+                "@ckeditor/ckeditor5-language": "42.0.1",
+                "@ckeditor/ckeditor5-link": "42.0.1",
+                "@ckeditor/ckeditor5-list": "42.0.1",
+                "@ckeditor/ckeditor5-markdown-gfm": "42.0.1",
+                "@ckeditor/ckeditor5-media-embed": "42.0.1",
+                "@ckeditor/ckeditor5-mention": "42.0.1",
+                "@ckeditor/ckeditor5-minimap": "42.0.1",
+                "@ckeditor/ckeditor5-page-break": "42.0.1",
+                "@ckeditor/ckeditor5-paragraph": "42.0.1",
+                "@ckeditor/ckeditor5-paste-from-office": "42.0.1",
+                "@ckeditor/ckeditor5-remove-format": "42.0.1",
+                "@ckeditor/ckeditor5-restricted-editing": "42.0.1",
+                "@ckeditor/ckeditor5-select-all": "42.0.1",
+                "@ckeditor/ckeditor5-show-blocks": "42.0.1",
+                "@ckeditor/ckeditor5-source-editing": "42.0.1",
+                "@ckeditor/ckeditor5-special-characters": "42.0.1",
+                "@ckeditor/ckeditor5-style": "42.0.1",
+                "@ckeditor/ckeditor5-table": "42.0.1",
+                "@ckeditor/ckeditor5-theme-lark": "42.0.1",
+                "@ckeditor/ckeditor5-typing": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-undo": "42.0.1",
+                "@ckeditor/ckeditor5-upload": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
+                "@ckeditor/ckeditor5-watchdog": "42.0.1",
+                "@ckeditor/ckeditor5-widget": "42.0.1",
+                "@ckeditor/ckeditor5-word-count": "42.0.1"
             }
         },
         "node_modules/color-convert": {
@@ -5388,9 +5388,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.4",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz",
-            "integrity": "sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==",
+            "version": "3.4.6",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz",
+            "integrity": "sha512-1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA==",
             "dev": true,
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
@@ -5663,9 +5663,9 @@
             "integrity": "sha512-z2YZusTFC6KnLERx1cgoIRX2CjPRP0W75N+3CC6gbvdX5Ch47rZkEMGO2Xnf+IEmi3RiFLxS18gayMA27iU7Kg=="
         },
         "node_modules/vite": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
-            "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
+            "version": "5.3.4",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz",
+            "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.21.3",
diff --git a/package.json b/package.json
index 13ff1458..bdd878d7 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
         "eslint-plugin-vue": "^9.27.0",
         "laravel-vite-plugin": "^1.0.5",
         "postcss": "^8.4.39",
-        "tailwindcss": "^3.4.4",
-        "vite": "^5.3.3",
+        "tailwindcss": "^3.4.6",
+        "vite": "^5.3.4",
         "vue": "^3.4.31"
     },
     "dependencies": {
         "@ckeditor/ckeditor5-vue": "^6.0.0",
         "@vueuse/components": "^10.11.0",
         "@vueuse/core": "^10.11.0",
-        "ckeditor5": "^42.0.0"
+        "ckeditor5": "^42.0.1"
     }
 }
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 21083b3b..7d088842 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -24,6 +24,10 @@ parameters:
             message: '#Property App\\Models\\Page::\$blocks is not writable\.#'
             path: app/Http/Resources/Views/Public/Content/HomepageContentResource.php
             count: 1
+        - # Works despite error, may break if strict types enforced
+            message: '#Property App\\Models\\Page::\$blocks is not writable\.#'
+            path: app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
+            count: 1
         - # From the way the methods are inherited by Pest
             message: '#Access to an undefined property Pest\\Mixins\\Expectation#'
             path: tests
diff --git a/resources/css/app.css b/resources/css/app.css
index 484f8724..fabdfb17 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -2,6 +2,8 @@
 
 @import "tailwindcss/components";
 @import "./components/articles";
+@import "./components/articles.page-title";
+@import "./components/articles.small-print";
 @import "./components/buttons";
 
 @import "tailwindcss/utilities";
diff --git a/resources/css/components/articles.css b/resources/css/components/articles.css
index ce2cd2c1..9ba8ef97 100644
--- a/resources/css/components/articles.css
+++ b/resources/css/components/articles.css
@@ -1,6 +1,12 @@
+section.app-article {
+  @apply
+    leading-relaxed;
+}
+
 section.app-article p {
   @apply
-    mb-4;
+    mb-4
+    text-justify;
 }
 
 section.app-article p a {
@@ -58,11 +64,72 @@ section.app-article p code {
 }
 
 section.app-article ul li i,
-section.app-article p i
-{
+section.app-article p i {
   @apply
     font-semibold
-    text-gray-900
-    dark:text-gray-100
     tracking-wide;
 }
+
+section.app-article blockquote,
+section.app-article q {
+  @apply
+    w-full
+    text-lg
+    text-gray-800
+    dark:text-gray-200
+    my-8
+    border-l-4
+    border-gray-900
+    dark:border-gray-300
+    px-4
+    py-2
+    bg-gray-200
+    dark:bg-gray-800;
+}
+
+section.app-article blockquote p,
+section.app-article q p {
+  @apply
+    mb-0;
+}
+
+section.app-article blockquote p i,
+section.app-article blockquote ul li i,
+section.app-article q p i,
+section.app-article q ul li i {
+  @apply
+    font-normal
+    tracking-widest;
+}
+
+section.app-article table {
+  @apply
+    table-auto
+    mb-12
+    mx-8;
+}
+
+section.app-article thead {
+  @apply
+    mb-2
+    border-b
+    border-gray-900
+    pb-2
+    dark:border-gray-100;
+}
+
+section.app-article tbody {
+  @apply
+    mt-2;
+}
+
+section.app-article tr {
+  @apply
+    text-left;
+}
+
+section.app-article td,
+section.app-article th {
+  @apply
+    p-2;
+}
diff --git a/resources/css/components/articles.page-title.css b/resources/css/components/articles.page-title.css
new file mode 100644
index 00000000..70c9c8ce
--- /dev/null
+++ b/resources/css/components/articles.page-title.css
@@ -0,0 +1,16 @@
+section.app-article h2.text-page-title {
+  @apply
+    font-semibold
+    uppercase
+    tracking-widest;
+}
+
+section.app-article p.text-page-subtitle {
+  @apply
+    pt-2
+    font-semibold
+    italic
+    text-xs
+    uppercase
+    tracking-widest;
+}
diff --git a/resources/css/components/articles.small-print.css b/resources/css/components/articles.small-print.css
new file mode 100644
index 00000000..2df0681c
--- /dev/null
+++ b/resources/css/components/articles.small-print.css
@@ -0,0 +1,27 @@
+section.app-article h3.text-small-print {
+  @apply
+    w-full
+    mt-4
+    mb-2
+    px-4
+    font-semibold
+    text-xs
+    uppercase
+    tracking-widest;
+}
+
+section.app-article p.text-small-print,
+section.app-article table.text-small-print,
+section.app-article ul.text-small-print {
+  @apply
+    text-sm
+    text-gray-800
+    dark:text-gray-200
+    px-4
+    pb-4;
+}
+
+section.app-article ul.text-small-print li {
+  @apply
+    ml-4;
+}
diff --git a/resources/css/components/buttons.css b/resources/css/components/buttons.css
index 594b9a0c..734be84f 100644
--- a/resources/css/components/buttons.css
+++ b/resources/css/components/buttons.css
@@ -3,6 +3,7 @@
     inline-flex
     items-center
     justify-center
+    h-8
     my-auto
     border
     px-4
diff --git a/resources/js/Components/Blocks/AppBlocks.vue b/resources/js/Components/Blocks/AppBlocks.vue
index c6fe3ba0..e7088978 100644
--- a/resources/js/Components/Blocks/AppBlocks.vue
+++ b/resources/js/Components/Blocks/AppBlocks.vue
@@ -32,7 +32,7 @@ import AppSectionDivider from '@/Components/Sections/AppSectionDivider.vue'
     <AppSectionHtml
       v-else
       :html="block.data.html"
-      class="app-article px-4 pb-8 leading-relaxed"
+      class="app-article px-4"
       :id="'section-' + index"
     ></AppSectionHtml>
   </div>
diff --git a/resources/js/Components/Blocks/BlockHeaderLogo.vue b/resources/js/Components/Blocks/BlockHeaderLogo.vue
index 9574b3a2..5d0dc2b5 100644
--- a/resources/js/Components/Blocks/BlockHeaderLogo.vue
+++ b/resources/js/Components/Blocks/BlockHeaderLogo.vue
@@ -11,9 +11,9 @@ defineProps({
 
 <template>
   <div class="flex justify-center gap-x-4 mt-4">
-    <IconAppLogo class="w-12 h-12 stroke-gray-900 fill-gray-900  dark:stroke-gray-100 dark:fill-gray-100" />
+    <IconAppLogo class="w-12 h-12 stroke-current fill-current" />
 
-    <h2 class="my-auto text-center text-xl font-bold text-gray-900 dark:text-gray-100">{{ blockData.heading }}</h2>
+    <h2 class="my-auto text-center text-xl font-bold">{{ blockData.heading }}</h2>
   </div>
 
   <p
diff --git a/resources/js/Components/Controls/Links/LinkButton.vue b/resources/js/Components/Controls/Links/LinkButton.vue
index 46d8b1f5..b072e84e 100644
--- a/resources/js/Components/Controls/Links/LinkButton.vue
+++ b/resources/js/Components/Controls/Links/LinkButton.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { Link } from '@inertiajs/vue3'
 import { computed } from 'vue'
 
 const props = defineProps({
@@ -29,11 +28,11 @@ const minWidthClass = computed(() => {
 </script>
 
 <template>
-  <Link
+  <a
     class="app-button-base"
     :class="[minWidthClass, customClasses]"
     :href="href"
   >
     <slot />
-  </Link>
+  </a>
 </template>
diff --git a/resources/js/Components/Controls/Tabs/TabControls.vue b/resources/js/Components/Controls/Tabs/TabControls.vue
index c9620fe0..02470a1d 100644
--- a/resources/js/Components/Controls/Tabs/TabControls.vue
+++ b/resources/js/Components/Controls/Tabs/TabControls.vue
@@ -27,7 +27,7 @@ onMounted(() => selectTab(0))
     <button
       v-for="(tab,index) in props.tabs"
       :key="index"
-      class="inline-flex space-x-2 border-t border-x rounded-t-lg px-6 py-3 bg-white dark:bg-gray-900 transition ease-in-out duration-150 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-900 dark:focus:ring-gray-100 focus:rounded-sm"
+      class="inline-flex space-x-2 border-t border-x rounded-t-lg px-6 py-3 bg-white dark:bg-gray-900 transition ease-in-out duration-150 focus:outline-none focus:ring-1 focus:ring-offset-1 focus:ring-gray-900 dark:focus:ring-gray-100 focus:rounded-md"
       :class="{ 'border-gray-900 dark:border-gray-100 font-semibold cursor-default': index === store.tabs[0].activeTab, 'border-gray-400 dark:border-gray-300 opacity-75 hover:opacity-100 cursor-pointer': index !== store.tabs[0].activeTab }"
       type="button"
       @click="selectTab(index)"
diff --git a/resources/js/Components/Forms/AppForm.vue b/resources/js/Components/Forms/AppForm.vue
index f87a729f..708be49d 100644
--- a/resources/js/Components/Forms/AppForm.vue
+++ b/resources/js/Components/Forms/AppForm.vue
@@ -1,4 +1,6 @@
 <script setup>
+const emit = defineEmits(['success'])
+
 const props = defineProps({
   endpoint: {
     type: String,
@@ -18,10 +20,12 @@ const submit = () => {
   if (props.method === 'patch') {
     props.form.patch(props.endpoint, {
       preserveScroll: true,
+      onSuccess: () => emit('success'),
     })
   } else {
     props.form.post(props.endpoint, {
       preserveScroll: true,
+      onSuccess: () => emit('success'),
     })
   }
 }
diff --git a/resources/js/Components/Forms/FormInput.vue b/resources/js/Components/Forms/FormInput.vue
index e4b0c543..906dc783 100644
--- a/resources/js/Components/Forms/FormInput.vue
+++ b/resources/js/Components/Forms/FormInput.vue
@@ -7,7 +7,7 @@ import { computed } from 'vue'
 const props = defineProps({
   inputErrorClasses: {
     type: String,
-    default: 'w-full',
+    default: 'w-full min-h-6',
   },
   inputField: {
     type: String,
@@ -39,6 +39,7 @@ const labelPositionClasses = computed(() => {
   return {
     top: 'w-full text-gray-700 dark:text-gray-300',
     left: 'my-3 w-full md:w-1/3 text-gray-700 dark:text-gray-300',
+    hidden: 'sr-only',
   }[props.inputLabelPosition]
 })
 
diff --git a/resources/js/Components/Forms/Inputs/InputBlocks.vue b/resources/js/Components/Forms/Inputs/InputBlocks.vue
index 242a7deb..34ed7225 100644
--- a/resources/js/Components/Forms/Inputs/InputBlocks.vue
+++ b/resources/js/Components/Forms/Inputs/InputBlocks.vue
@@ -38,7 +38,7 @@ const props = defineProps({
       :key="inputIndex"
     >
       <InputLabel
-        class="block w-full font-medium text-sm mb-2"
+        :class="input.type === 'wysiwyg' ? 'sr-only' : 'block w-full font-medium text-sm mb-2'"
         :value="input.label"
       />
 
diff --git a/resources/js/Components/Forms/Inputs/InputError.vue b/resources/js/Components/Forms/Inputs/InputError.vue
index 0c80e709..e4752536 100644
--- a/resources/js/Components/Forms/Inputs/InputError.vue
+++ b/resources/js/Components/Forms/Inputs/InputError.vue
@@ -7,7 +7,7 @@ defineProps({
 </script>
 
 <template>
-  <div class="min-h-6">
+  <div>
     <p v-show="message" class="text-sm text-red-600">
       ✗ {{ message }}
     </p>
diff --git a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
index c42214db..43bec348 100644
--- a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
+++ b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
@@ -7,13 +7,16 @@ import {
   Bold,
   Italic,
   BlockQuote,
+  GeneralHtmlSupport,
   Heading,
   Link,
   List,
   Paragraph,
+  Style,
   Table,
   TableToolbar,
   TextTransformation,
+  Underline,
 } from 'ckeditor5'
 import 'ckeditor5/ckeditor5.css'
 
@@ -29,13 +32,16 @@ class Editor extends ClassicEditor {
     Bold,
     Italic,
     BlockQuote,
+    GeneralHtmlSupport,
     Heading,
     Link,
     List,
     Paragraph,
+    Style,
     Table,
     TableToolbar,
     TextTransformation,
+    Underline,
   ]
 
   static defaultConfig = {
@@ -45,9 +51,11 @@ class Editor extends ClassicEditor {
         'redo',
         '|',
         'heading',
+        'style',
         '|',
         'bold',
         'italic',
+        'underline',
         '|',
         'link',
         'insertTable',
@@ -57,6 +65,40 @@ class Editor extends ClassicEditor {
         'numberedList',
       ],
     },
+    style: {
+      definitions: [
+        {
+          name: 'Heading 2 - Page Title',
+          element: 'h2',
+          classes: ['text-page-title'],
+        },
+        {
+          name: 'Heading 3 - Small Print',
+          element: 'h3',
+          classes: ['text-small-print'],
+        },
+        {
+          name: 'Paragraph - Small Print',
+          element: 'p',
+          classes: ['text-small-print'],
+        },
+        {
+          name: 'Paragraph - Page Subtitle',
+          element: 'p',
+          classes: ['text-page-subtitle'],
+        },
+        {
+          name: 'Table - Small Print',
+          element: 'table',
+          classes: ['text-small-print'],
+        },
+        {
+          name: 'List (Points) - Small Print',
+          element: 'ul',
+          classes: ['text-small-print'],
+        },
+      ],
+    },
     link: {
       decorators: {
         openInNewTab: {
@@ -86,12 +128,12 @@ Editor
 </script>
 
 <template>
-  <div class="bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-100 border-gray-500 focus:border-gray-100 focus:ring-gray-100 rounded-md shadow-sm dark:shadow-none">
+  <section class="app-article bg-gray-100 dark:bg-gray-900 border-gray-500 focus:border-gray-100 focus:ring-gray-100 rounded-md shadow-sm dark:shadow-none">
     <CKEditor.component
       :editor="Editor"
       v-model="model"
     ></CKEditor.component>
-  </div>
+  </section>
 </template>
 
 <style>
diff --git a/resources/js/Layouts/LayoutDefault.vue b/resources/js/Layouts/LayoutDefault.vue
deleted file mode 100644
index a9a4df07..00000000
--- a/resources/js/Layouts/LayoutDefault.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<script setup>
-import AppSectionHtml from '@/Components/Sections/AppSectionHtml.vue'
-import LayoutGuest from '@/Layouts/LayoutGuest.vue'
-</script>
-
-<template>
-  <LayoutGuest>
-    <template #pageHeader>
-      <h2 class="font-semibold text-md text-gray-900 dark:text-gray-100 uppercase tracking-widest">{{ $page.props.content.heading }}</h2>
-
-      <p
-        v-if="$page.props.content.subheading !== ''"
-        class="pt-2 font-semibold text-xs text-gray-900 dark:text-gray-100 uppercase tracking-widest"
-      >
-        <em>{{ $page.props.content.subheading }}</em>
-      </p>
-    </template>
-
-    <AppSectionHtml
-      v-if="$page.props.content.bodytext !== ''"
-      :html="$page.props.content.bodytext"
-      :id="$page.props.content.heading.replace(' ', '-').toLowerCase()"
-    />
-
-    <slot />
-  </LayoutGuest>
-</template>
diff --git a/resources/js/Pages/Admin/AdminCreateEdit.vue b/resources/js/Pages/Admin/AdminCreateEdit.vue
index b8ca30bf..def19dad 100644
--- a/resources/js/Pages/Admin/AdminCreateEdit.vue
+++ b/resources/js/Pages/Admin/AdminCreateEdit.vue
@@ -2,6 +2,9 @@
 import AppPanel from '@/Components/Sections/AppPanel.vue'
 import LayoutUser from '@/Layouts/LayoutUser.vue'
 import CreateEditPage from './Partials/CreateEditPage.vue'
+import { router } from '@inertiajs/vue3'
+
+router.reload({ only: ['content'] })
 
 const props = defineProps({
   content: {
diff --git a/resources/js/Pages/Admin/Partials/CreateEditControls.vue b/resources/js/Pages/Admin/Partials/CreateEditControls.vue
new file mode 100644
index 00000000..b5773717
--- /dev/null
+++ b/resources/js/Pages/Admin/Partials/CreateEditControls.vue
@@ -0,0 +1,97 @@
+<script setup>
+import AppButton from '@/Components/Controls/Buttons/AppButton.vue'
+import InputError from '@/Components/Forms/Inputs/InputError.vue'
+import InputSuccess from '@/Components/Forms/Inputs/InputSuccess.vue'
+import LinkButton from '@/Components/Controls/Links/LinkButton.vue'
+import OutlineArrowTopRightOnSquare from '@/Components/Icons/HeroIcons/Outline/OutlineArrowTopRightOnSquare.vue'
+import OutlineArrowUturnLeft from '@/Components/Icons/HeroIcons/Outline/OutlineArrowUturnLeft.vue'
+import OutlinePaperAirplane from '@/Components/Icons/HeroIcons/Outline/OutlinePaperAirplane.vue'
+import { usePage } from '@inertiajs/vue3'
+
+defineProps({
+  parentForm: {
+    type: Object,
+    required: true,
+  },
+  showPreviewButton: {
+    type: Boolean,
+    default: false,
+  },
+  urlPreview: {
+    type: String,
+    default: '',
+  },
+  urlReturn: {
+    type: String,
+    default: '',
+  },
+  urlView: {
+    type: String,
+    default: '',
+  },
+})
+</script>
+
+<template>
+  <div class="w-full flex mt-4 pt-4 px-4">
+    <span class="w-full sm:w-1/2 xl:w-1/4 min-h-8">
+      <InputError class="my-2" :message="parentForm.hasErrors ? 'Please update the indicated fields' : ''" />
+
+      <InputSuccess :message="usePage().props.flash.status" />
+    </span>
+
+    <span class="w-full sm:w-1/2 xl:w-1/4 h-8 my-auto py-1">
+      <progress
+        v-if="parentForm.progress"
+        class="w-full my-auto"
+        max="100"
+        :value="parentForm.progress.percentage"
+      >
+        {{ parentForm.progress.percentage }}%
+      </progress>
+    </span>
+
+    <span class="sm:flex w-full xl:w-1/2 justify-end space-y-2 sm:space-y-0 sm:space-x-2 my-auto">
+      <LinkButton
+        v-if="urlReturn !== ''"
+        custom-classes="app-button-secondary-gray-100"
+        :href="returnUrl"
+        min-width="md"
+      >
+        Cancel <OutlineArrowUturnLeft class="ml-2 h-4 w-4" />
+      </LinkButton>
+
+      <LinkButton
+        v-show="urlPreview !== '' && showPreviewButton"
+        custom-classes="app-button-secondary-gray-100"
+        :href="previewUrl"
+        min-width="md"
+        title="Preview the draft page"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Preview <OutlineArrowTopRightOnSquare class="-mt-0.5 -mr-0.5 ml-2 h-4 w-4" />
+      </LinkButton>
+
+      <LinkButton
+        v-show="urlView !== '' && !showPreviewButton"
+        custom-classes="app-button-secondary-gray-100"
+        :href="viewUrl"
+        min-width="md"
+        title="View the page"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        View <OutlineArrowTopRightOnSquare class="-mt-0.5 -mr-0.5 ml-2 h-4 w-4" />
+      </LinkButton>
+
+      <AppButton
+        :class="{ 'opacity-25': parentForm.processing }"
+        :disabled="parentForm.processing"
+        min-width="md"
+      >
+        Save <OutlinePaperAirplane class="ml-2 h-4 w-4" />
+      </AppButton>
+    </span>
+  </div>
+</template>
diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index 1a035389..3f73de7f 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -1,168 +1,144 @@
 <script setup>
-import AppButton from '@/Components/Controls/Buttons/AppButton.vue'
 import AppForm from '@/Components/Forms/AppForm.vue'
 import FormInput from '@/Components/Forms/FormInput.vue'
 import InputBlocks from '@/Components/Forms/Inputs/InputBlocks.vue'
 import InputCheckbox from '@/Components/Forms/Inputs/InputCheckbox.vue'
-import InputError from '@/Components/Forms/Inputs/InputError.vue'
-import InputSuccess from '@/Components/Forms/Inputs/InputSuccess.vue'
+import InputSelect from '@/Components/Forms/Inputs/InputSelect.vue'
 import InputText from '@/Components/Forms/Inputs/InputText.vue'
-import InputWysiwyg from '@/Components/Forms/Inputs/InputWysiwyg.vue'
-import OutlinePaperAirplane from '@/Components/Icons/HeroIcons/Outline/OutlinePaperAirplane.vue'
+import AppSectionDivider from '@/Components/Sections/AppSectionDivider.vue'
+import TabBody from '@/Components/Controls/Tabs/TabBody.vue'
+import TabControls from '@/Components/Controls/Tabs/TabControls.vue'
+import CreateEditControls from '@/Pages/Admin/Partials/CreateEditControls.vue'
 import { useForm, usePage } from '@inertiajs/vue3'
+import { reactive } from 'vue'
 
 const page = usePage().props.content
 
 const form = useForm({
   blocks: page.blocks,
-  content: page.content,
   inSitemap: page.inSitemap,
   metaDescription: page.metaDescription,
-  metaTitle: page.metaTitle,
-  subtitle: page.subtitle,
   title: page.title,
+  webpageStatusId: page.webpageStatusId,
+})
+
+const state = reactive({
+  showPreviewButton: page.webpageStatusId === 1,
 })
 
 </script>
 
 <template>
-  <h3 class="w-full py-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Edit Page: {{ page.title }}</h3>
+  <h3 class="w-full p-4 font-semibold text-xs uppercase tracking-widest">Edit Page: {{ page.title }}</h3>
 
   <AppForm
     class="w-full"
     method="patch"
     :endpoint="route('admin.page.edit', page.id)"
     :form="form"
+    @success="state.showPreviewButton = form.webpageStatusId === 1"
   >
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Title*"
-        input-label-position="left"
-        input-field="title"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-title"
-          name="title"
-          type="text"
-          class="block w-full"
-          v-model="form.title"
-          autofocus
-        />
-      </FormInput>
-    </div>
-
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Subtitle"
-        input-label-position="left"
-        input-field="subtitle"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-subtitle"
-          name="subtitle"
-          type="text"
-          class="block w-full"
-          v-model="form.subtitle"
-        />
-      </FormInput>
-    </div>
-
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Content"
-        input-label-position="left"
-        input-field="content"
-        :parent-form="form"
-      >
-        <InputWysiwyg
-          id="input-content"
-          class="block w-full"
-          v-model="form.content"
-        />
-      </FormInput>
-    </div>
-
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Blocks"
-        input-label-position="left"
-        input-field="blocks"
-        :parent-form="form"
-      >
-        <InputBlocks
-          :blocks="form.blocks"
-        />
-      </FormInput>
-    </div>
-
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Meta Title"
-        input-label-position="left"
-        input-field="metaTitle"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-meta-title"
-          name="metaTitle"
-          type="text"
-          class="block w-full"
-          v-model="form.metaTitle"
-        />
-      </FormInput>
-    </div>
-
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Meta Description"
-        input-label-position="left"
-        input-field="metaDescription"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-meta-description"
-          name="metaDescription"
-          type="text"
-          class="block w-full"
-          v-model="form.metaDescription"
-        />
-      </FormInput>
-    </div>
-
-    <div class="w-full flex p-4">
-      <label class="flex items-start">
-        <InputCheckbox name="inSitemap" v-model:checked="form.inSitemap" />
-
-        <span class="ms-2 text-sm text-gray-700 dark:text-gray-300">In Sitemap?</span>
-      </label>
-    </div>
-
-    <div class="w-full flex mt-4 pt-4 justify-between">
-      <span class="flex mt-4">
-        <InputError class="my-auto" :message="form.hasErrors ? 'Please update the indicated fields' : ''" />
-
-        <InputSuccess class="my-auto" :message="usePage().props.flash.status" />
-      </span>
-
-      <span class="w-1/2 h-8 my-auto py-1">
-        <progress
-          v-if="form.progress"
-          class="w-full my-auto"
-          max="100"
-          :value="form.progress.percentage"
+    <TabControls
+      class="pt-4 px-4"
+      :tabs="['Content', 'Meta Data']"
+    />
+
+    <AppSectionDivider margin="min" />
+
+    <TabBody
+      class="mx-4 pt-4 px-4 bg-white dark:bg-gray-900 rounded-b-md"
+      :tab="0"
+    >
+      <div class="w-full flex pt-4 px-4">
+        <FormInput
+          input-label="Blocks"
+          input-label-position="hidden"
+          input-field="blocks"
+          :parent-form="form"
         >
-          {{ form.progress.percentage }}%
-        </progress>
-      </span>
-
-      <AppButton
-        :class="{ 'opacity-25': form.processing }"
-        :disabled="form.processing"
-      >
-        Save <OutlinePaperAirplane class="ml-2 h-4 w-4" />
-      </AppButton>
-    </div>
+          <InputBlocks
+            :blocks="form.blocks"
+          />
+        </FormInput>
+      </div>
+    </TabBody>
+
+    <TabBody
+      class="mx-4 px-4 py-8 bg-white dark:bg-gray-900 rounded-b-md"
+      :tab="1"
+    >
+      <div class="w-full flex pt-2 px-4">
+        <FormInput
+          input-label="Title*"
+          input-label-position="left"
+          input-field="title"
+          :parent-form="form"
+        >
+          <InputText
+            id="input-title"
+            name="title"
+            type="text"
+            class="block w-full"
+            v-model="form.title"
+            autofocus
+          />
+        </FormInput>
+      </div>
+
+      <div class="w-full flex pt-2 px-4">
+        <FormInput
+          input-label="Meta Description"
+          input-label-position="left"
+          input-field="metaDescription"
+          :parent-form="form"
+        >
+          <InputText
+            id="input-meta-description"
+            name="metaDescription"
+            type="text"
+            class="block w-full"
+            v-model="form.metaDescription"
+          />
+        </FormInput>
+      </div>
+
+      <div class="w-full flex pt-2 px-4">
+        <FormInput
+          input-label="Webpage Status"
+          input-label-position="left"
+          input-field="webpageStatusId"
+          :parent-form="form"
+        >
+          <InputSelect
+            id="input-webpage-status-id"
+            name="webpageStatusId"
+            class="block w-full"
+            v-model="form.webpageStatusId"
+            :class="{ 'opacity-25': form.processing }"
+            :disabled="form.processing"
+            :options="{
+              0: { label: 'Draft', value: 1 },
+              1: { label: 'Published', value: 2 },
+            }"
+          />
+        </FormInput>
+      </div>
+
+      <div class="w-full flex pt-2 px-4">
+        <label class="flex items-start text-sm">
+          <InputCheckbox class="my-auto" name="inSitemap" v-model:checked="form.inSitemap" />
+
+          <span class="ms-2 text-gray-700 dark:text-gray-300">In Sitemap?</span>
+        </label>
+      </div>
+    </TabBody>
+
+    <CreateEditControls
+      :parent-form="form"
+      :show-preview-button="state.showPreviewButton"
+      :url-preview-url="route('admin.page.show', page.id)"
+      :url-return="route('dashboard')"
+      :url-view="route('page.show', page.slug)"
+    />
   </AppForm>
 </template>
diff --git a/resources/js/Pages/Public/Partials/ContentControls.vue b/resources/js/Pages/Public/Partials/ContentControls.vue
index 816fa1f5..3fbde563 100644
--- a/resources/js/Pages/Public/Partials/ContentControls.vue
+++ b/resources/js/Pages/Public/Partials/ContentControls.vue
@@ -7,17 +7,17 @@ import TabControls from '@/Components/Controls/Tabs/TabControls.vue'
 </script>
 
 <template>
-  <h3 class="w-full pt-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Tab Component</h3>
+  <h3 class="w-full px-4 font-semibold text-xs uppercase tracking-widest">Tab Component</h3>
 
   <TabControls
-    class="pt-4"
+    class="pt-4 px-4"
     :tabs="['Pop-ups', 'Buttons']"
   />
 
   <AppSectionDivider margin="min" />
 
   <TabBody
-    class="px-4 bg-white dark:bg-gray-900"
+    class="mx-4 px-4 bg-white dark:bg-gray-900"
     :tab="0"
   >
     <ControlsTabPopUps />
diff --git a/resources/js/Pages/Public/Partials/ContentForms.vue b/resources/js/Pages/Public/Partials/ContentForms.vue
index a42da793..c785b603 100644
--- a/resources/js/Pages/Public/Partials/ContentForms.vue
+++ b/resources/js/Pages/Public/Partials/ContentForms.vue
@@ -28,10 +28,8 @@ const form = useForm({
 </script>
 
 <template>
-  <h3 class="w-full py-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Form &amp; Input Components</h3>
-
   <AppForm
-    class="w-full"
+    class="w-full px-4"
     :endpoint="route('page.store', 'forms')"
     :form="form"
   >
@@ -168,7 +166,7 @@ const form = useForm({
 
   <AppSectionDivider margin="xl" />
 
-  <h3 class="mb-4 text-lg font-bold text-gray-600 dark:text-gray-300">Results:</h3>
+  <h3 class="mb-4 px-4 text-lg font-bold text-gray-600 dark:text-gray-300">Results:</h3>
 
   <div class="w-full flex p-4 bg-gray-300 dark:bg-gray-700">
     <code v-if="usePage().props.flash.output" class="text-gray-600 dark:text-gray-400">{{ usePage().props.flash.output }}</code>
diff --git a/resources/js/Pages/Public/Partials/ContentHomepage.vue b/resources/js/Pages/Public/Partials/ContentHomepage.vue
deleted file mode 100644
index dbda83dc..00000000
--- a/resources/js/Pages/Public/Partials/ContentHomepage.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<script setup>
-import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
-</script>
-
-<template>
-  <AppBlocks
-    v-if="$page.props.content.blocks ?? []"
-  />
-</template>
diff --git a/resources/js/Pages/Public/PublicContent.vue b/resources/js/Pages/Public/PublicContent.vue
index 1f8806cc..95de27a0 100644
--- a/resources/js/Pages/Public/PublicContent.vue
+++ b/resources/js/Pages/Public/PublicContent.vue
@@ -1,6 +1,6 @@
 <script setup>
 import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
-import LayoutDefault from '@/Layouts/LayoutDefault.vue'
+import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 
 defineProps({
   content: {
@@ -15,7 +15,7 @@ defineProps({
 </script>
 
 <template>
-  <LayoutDefault>
+  <LayoutGuest>
     <AppBlocks />
-  </LayoutDefault>
+  </LayoutGuest>
 </template>
diff --git a/resources/js/Pages/Public/PublicContentControls.vue b/resources/js/Pages/Public/PublicContentControls.vue
index eeae6a51..4ba7335d 100644
--- a/resources/js/Pages/Public/PublicContentControls.vue
+++ b/resources/js/Pages/Public/PublicContentControls.vue
@@ -1,5 +1,6 @@
 <script setup>
-import LayoutDefault from '@/Layouts/LayoutDefault.vue'
+import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
+import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 import ContentControls from '@/Pages/Public/Partials/ContentControls.vue'
 
 defineProps({
@@ -15,7 +16,9 @@ defineProps({
 </script>
 
 <template>
-  <LayoutDefault>
+  <LayoutGuest>
+    <AppBlocks />
+
     <ContentControls />
-  </LayoutDefault>
+  </LayoutGuest>
 </template>
diff --git a/resources/js/Pages/Public/PublicContentForms.vue b/resources/js/Pages/Public/PublicContentForms.vue
index 75a071dd..1343469f 100644
--- a/resources/js/Pages/Public/PublicContentForms.vue
+++ b/resources/js/Pages/Public/PublicContentForms.vue
@@ -1,5 +1,6 @@
 <script setup>
-import LayoutDefault from '@/Layouts/LayoutDefault.vue'
+import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
+import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 import ContentForms from '@/Pages/Public/Partials/ContentForms.vue'
 
 defineProps({
@@ -15,7 +16,9 @@ defineProps({
 </script>
 
 <template>
-  <LayoutDefault>
+  <LayoutGuest>
+    <AppBlocks />
+
     <ContentForms />
-  </LayoutDefault>
+  </LayoutGuest>
 </template>
diff --git a/resources/js/Pages/Public/PublicHomepage.vue b/resources/js/Pages/Public/PublicHomepage.vue
deleted file mode 100644
index 12d30d5c..00000000
--- a/resources/js/Pages/Public/PublicHomepage.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup>
-import IconAppLogo from '@/Components/Icons/IconAppLogo.vue'
-import LayoutGuest from '@/Layouts/LayoutGuest.vue'
-import ContentHomepage from '@/Pages/Public/Partials/ContentHomepage.vue'
-
-defineProps({
-  content: {
-    type: Object,
-    default: () => ({}),
-  },
-  metadata: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-</script>
-
-<template>
-  <LayoutGuest>
-    <ContentHomepage />
-  </LayoutGuest>
-</template>
diff --git a/resources/views/partials/body/privacy.blade.php b/resources/views/partials/body/privacy.blade.php
deleted file mode 100644
index d2239736..00000000
--- a/resources/views/partials/body/privacy.blade.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<hr class="my-8 border-gray-900 dark:border-gray-100" />
-
-<p class="pb-4 text-justify">
-    This privacy policy (“policy”) will help you understand how {{ config('metadata.author') }} (“our”, “us”, “we”) uses and protects the data you provide to us when you visit and use <a href="{{ route('home') }}" title="{{ config('app.name') }}" class="underline">{{ substr(route('home'), strpos(route('home'), '://') + 3) }}</a> (“app”, “service”, “website”).
-    The policy also applies when you correspond with us in person, by letter, by phone, email or any other means.
-    We reserve the right to change this policy at any time by publishing updates to this page.
-    We are committed to protecting your data, please read the following carefully to understand how we will treat it.
-</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Information We May Collect
-</h3>
-
-<p class="pb-4 text-justify">Personal data (as defined in the GDPR), or personal information, is any information about an individual from which that person can be then identified. It does not include data where the identity has been removed or has been replaced with artificial identifies or pseudonyms (Anonymous or Pseudonymised Data). When visiting our Sites, accessing our Services, Products or corresponding with us in person, by phone, email or any other method you may provide us with information that would be classed as personal data about you and others you are acting on behalf of. We may collect, use, store and/or transfer data depending on the product, services or site you are accessing, the different kinds of personal data are grouped together as follows;</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>Identity Data</strong> – which includes your first name, surname, username or similar identifier, marital status, title, date of birth and gender.</li>
-    <li class="ml-4"><strong>Contact Data</strong> – which includes your billing address delivery address, home address, email address and telephone numbers.</li>
-    <li class="ml-4"><strong>Financial Data</strong> – which includes your bank account and payment card details.</li>
-    <li class="ml-4"><strong>Transaction Data</strong> – includes details about payments to and from you and other details of products and services you have purchased from us.</li>
-    <li class="ml-4"><strong>Technical Data</strong> – includes internet protocol (IP) address, your login data, browser type and version, time zone setting and location, browser plug-in types and versions, operating system and platform and other technology on the devices you use to access the Sites.</li>
-    <li class="ml-4"><strong>Profile Data</strong> - which includes your username and password for any accounts set up to access our products and services, purchases or orders made by you, feedback responses.</li>
-    <li class="ml-4"><strong>Usage Data</strong> – which includes information about how you use our Sites, products and services.</li>
-    <li class="ml-4"><strong>Marketing and Communications Data</strong> – which includes your preferences in receiving marketing from us and our third parties and your communication preferences.</li>
-</ul>
-
-<p class="pb-4 text-justify">We may collect Special Categories of your Personal Data if required as part of the services or products you are using. Where we are required to collect personal data by law, or under the terms of a contract we hold with you and you fail to provide this data when requested, we may not be able to perform the contract we have or are entering with you. (for example, to provide you with web development services). In this case, it may be a requirement for us to cancel the service or product you have asked us to provide, should this happen we will notify you accordingly.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Keeping your Data Secure
-</h3>
-
-<p class="pb-4 text-justify">Keeping your data secure is important to us, therefore, we have in place appropriate security measure to prevent unauthorised access, accidental loss, alteration or disclosure. We ensure that our computers and devices are fully updated with virus software and personal protection measures. In addition to this we limit access to your personal data to those employees, agents, contractors and other third parties who have a business need to know and therefore will only process your personal data on our instructions in accordance with this policy and are subject to a duty of confidentiality.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    How we collect your Data
-</h3>
-
-<p class="pb-4 text-justify">We use different methods to collect data from and about you through;</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>Direct Interactions</strong> – You may give us any of the categories of data identified above by filling in forms on our Sites or by corresponding with us in person, by phone, email or any other method. This includes personal data you provide when you:
-        <ul class="pb-4">
-            <li class="ml-4">- Register to use our Sites;</li>
-            <li class="ml-4">- Make a request for our products/services;</li>
-            <li class="ml-4">- Requesting marketing communication to be sent to you or others you are acting on behalf of;</li>
-            <li class="ml-8"><em>or</em></li>
-            <li class="ml-4">- Providing feedback;</li>
-            <li class="ml-4">- Third parties or publicly available sources – personal data about you may be received through various third parties and public sources such as analytics providers, advertising networks and/or search information providers based inside the European Economic Area (EEA);</li>
-            <li class="ml-4">- Contact, Financial and Transaction Data (if applicable) from providers of technical, payment and delivery services inside the EEA.</li>
-        </ul>
-    </li>
-</ul>
-
-<h3 id="cookies" class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Cookies
-</h3>
-
-<p class="pb-4 text-justify">
-    This site uses necessary first-party cookies for anti-forgery to prevent attacks.
-    If you consent to us storing an acknowledgement of this on your device, by selecting 'Remember my choice' when accepting the app's cookie notification form,
-    then we will also store a first-party cookie to record this consent on your device.
-</p>
-
-<table class="table-auto mt-4 mb-12 mx-4">
-    <thead class="mb-2 border-b border-gray-900 pb-2 dark:border-gray-100">
-        <tr class="text-left">
-            <th class="p-2">Cookie</th>
-            <th class="p-2">Common Name</th>
-            <th class="p-2">Purpose</th>
-            <th class="p-2">Storage Conditions</th>
-            <th class="pt-2 px-2 pb-4">Expiry</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr class="text-left">
-            <td class="pt-4 px-2 pb-2"><code>{{ Str::slug(config('app.name'), '_') . '_session' }}</code></td>
-            <td class="p-2"><strong>Session Token</strong></td>
-            <td class="p-2">Identifier to help preserve client-side state</td>
-            <td class="p-2"><em>On use of the website</em></td>
-            <td class="p-2">{{ config('session.lifetime') }} minutes after last use of the website</td>
-        </tr>
-        <tr class="text-left">
-            <td class="p-2"><code>XSRF-TOKEN</code></td>
-            <td class="p-2"><strong>XSRF Token</strong></td>
-            <td class="p-2">Identifier to help prevent cross-site request forgery</td>
-            <td class="p-2"><em>On use of the website</em></td>
-            <td class="p-2">{{ config('session.lifetime') }} minutes after last use of the website</td>
-        </tr>
-        <tr class="text-left">
-            <td class="p-2"><code>consent-storage-granted</code></td>
-            <td class="p-2"><strong>Storage Consent Token</strong></td>
-            <td class="p-2">Identifier to record consent for storing cookies on this device</td>
-            <td class="p-2"><em>On indication of consent</em></td>
-            <td class="p-2">365 x 24 hours from the time the relevant consent was indicated, or until this policy changes, whichever is sooner</td>
-        </tr>
-    </tbody>
-</table>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Why we will use your Data
-</h3>
-
-<p class="pb-4 text-justify">Your personal data will be processed in accordance with Article 6 of the General Data Protection Regulation (GDPR) which states that there must be a lawful basis for processing personal data. Each lawful basis is set out below, and at least one must apply whenever personal data is processed.</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>Consent</strong>: you have given clear consent for us to process your personal data for a specific purpose</li>
-    <li class="ml-4"><strong>Contract</strong>: processing is necessary for a contract we have with you, or because you have asked us to take specific steps before entering into a contract</li>
-    <li class="ml-4"><strong>Legal obligation</strong>: it is necessary for us to comply with a legal or regulatory obligation (not including contractual obligations)</li>
-    <li class="ml-4"><strong>Vital interests</strong>: processing is necessary to protect someone’s life</li>
-    <li class="ml-4">
-        <strong>Legitimate interests</strong>: processing is necessary for our legitimate interests (for example to administer and maintain our website(s)) or the legitimate interests of a third party unless there is a good reason to protect your personal data which overrides those legitimate interests. We make sure we consider and balance any potential impact on you (both positive and negative) and your rights before we process your personal data for our legitimate interests. We do not use your personal data for activities where our interests are overridden by the impact on you (unless we have your consent or are otherwise required or permitted to by law). We rely on the following interests when processing your personal data:
-        <ul class="pb-4">
-            <li class="ml-8">- To manage our business and comply with our obligations to our patients, staff and suppliers.</li>
-            <li class="ml-8">- To protect our proprietary and commercially sensitive information.</li>
-            <li class="ml-8">- To administer and maintain our websites.</li>
-        </ul>
-    </li>
-</ul>
-
-<p class="pb-4 text-justify">Your personal data may be processed on more than one lawful ground this will depend on the specific purpose for which we are using your data. Generally, we will not rely on consent as a legal basis for processing your personal data. However, where we do ask for your consent, we will do so in order to comply with the principle that any processing must be lawful, fair and transparent.</p>
-<p class="pb-4 text-justify">For more information on the types of lawful basis that we will rely on to process your personal data can be found on the <a href="https://ico.org.uk/for-organisations/guide-to-data-protection/guide-to-the-general-data-protection-regulation-gdpr/lawful-basis-for-processing/" target="_blank" rel="noopener noreferrer" title="Visit the Information Commissioner’s Office (ICO) website" class="underline">Information Commissioner’s Office (ICO) website</a>.</p>
-<p class="pb-4 text-justify">There may be a requirement to process your personal data on more than one lawful basis, depending on the specific purpose for which we are using your data. If you need details about the specific legal grounds, we are relying on to process your personal data then please contact us. (Contact Details listed below).</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Disclosing your Personal Data
-</h3>
-
-<p class="pb-4 text-justify">In order to provide you with our services/products it may be a requirement to share your personal data with the parties listed below. We require all third parties to respect the security of your personal data and to treat it in accordance with the law and our instructions, when they are processing personal data on our behalf. We do not allow our third-party service providers to use your personal data for their own purposes.</p>
-
-<ul class="pb-4">
-    <li class="ml-4">- Third parties who you authorise to provide services/products to you;</li>
-    <li class="ml-4">- Sub-contractors for the performance of any contract(s) we enter into with you or them;</li>
-    <li class="ml-4">- Healthcare professionals during the course of the services that both we and they provide to you;</li>
-    <li class="ml-4">- Service providers acting as processors who provide IT and system administration services.</li>
-    <li class="ml-4">- Professional advisers including lawyers, bankers, auditors and insurers based who provide consultancy, banking, legal, insurance and accounting services.</li>
-</ul>
-
-<p class="pb-4 text-justify">We do not transfer your personal data outside of the EEA if within the EEA or within the country of origin if outside the EEA.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Change of Purpose
-</h3>
-
-<p class="pb-4 text-justify">Your personal data will only be used for the purpose it was originally collected, unless we reasonably consider that we need to use it for another reason and that reason is compatible with the original purpose. For an explanation as to how the processing for the new purpose is compatible with the original purpose, please contact us.</p>
-<p class="pb-4 text-justify">If we need to use your personal data for an unrelated purpose, we will notify you and we will explain the legal basis which allows us to do so.</p>
-<p class="pb-4 text-justify">Please note that we may process your personal data without your knowledge or consent, in compliance with the above rules, where this is required or permitted by law.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Marketing
-</h3>
-
-<p class="pb-4 text-justify">You will be provided with choices regarding certain personal data uses, particularly around marketing and advertising. We may use your Identity, Contact, Technical, Usage and Profile Data to form a view on what we think may be a need or a want, or what may be of interest to you. This is how we determined which products, services and offers may be relevant for you (we call this marketing).</p>
-<p class="pb-4 text-justify">You will receive marketing communications from us if you have requested information from us or purchased products or services from us and, in each case, you have not opted out of receiving that marketing. We will always obtain your consent prior to sharing your personal data with any other company for marketing purposes.</p>
-<p class="pb-4 text-justify">You can ask us or third parties to stop sending you marketing messages at any time by logging into the Site and checking or unchecking relevant boxes to adjust your marketing preferences or by following the opt-out links on any marketing message sent to you or by contacting us at any time.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Retention
-</h3>
-
-<p class="pb-4 text-justify">Your personal data will only be retained for as long as necessary to fulfil the purposes we collected it for, including for the purposes of satisfying any legal, accounting, or reporting requirements. To determine the appropriate retention period for personal data, we consider the amount, nature, and sensitivity of the personal data, the potential risk of harm from unauthorised use or disclosure of your personal data, the purposes for which we process your personal data and whether we can achieve those purposes through other means, and the applicable legal requirements.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Your Legal Rights
-</h3>
-
-<p class="pb-4 text-justify">Under certain circumstances, you have rights under data protection laws in relation to your personal data. For further information please click on the link below to access the ICO website to find out more about <a href="https://ico.org.uk/your-data-matters/" target="_blank" rel="noopener noreferrer" title="Visit the Information Commissioner’s Office (ICO) website" class="underline">these rights</a>;</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>The right to be informed</strong></li>
-    <li class="ml-4"><strong>The right of access</strong></li>
-    <li class="ml-4"><strong>The right to get your data corrected</strong></li>
-    <li class="ml-4"><strong>The right to erasure</strong></li>
-    <li class="ml-4"><strong>The right to restrict processing</strong></li>
-    <li class="ml-4"><strong>The right to data portability</strong></li>
-    <li class="ml-4"><strong>The right to object</strong></li>
-    <li class="ml-4"><strong>Rights in relation to automated decision making and profiling</strong></li>
-</ul>
-
-<p class="pb-4 text-justify">To exercise any of the rights set our above, please contact us;</p>
-<p class="pb-4 text-justify">If you are unhappy with how we are processing your personal data, you have the right to complaint to ICO. The Information Commissioner can be contacted at: <a href="https://ico.org.uk/make-a-complaint/" target="_blank" rel="noopener noreferrer" title="Visit the Information Commissioner’s Office (ICO) complaints page" class="underline">ico.org.uk/make-a-complaint</a>.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Fees
-</h3>
-
-<p class="pb-4 text-justify">No fees are required to access your personal data (or to exercise any of the other rights), however, we may charge a reasonable fee if your request is clearly unfounded, repetitive or excessive. Alternatively, we may refuse to comply with your request in these circumstances.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    What we may need from you
-</h3>
-
-<p class="pb-4 text-justify">We may need to request specific information form you to help confirm your identity and ensure your right to access your personal data (or to exercise any of your other rights). This is a security measure to ensure that personal data is not disclosed to any person who has no right to receive it. We may also contact you to ask you for further information in relation to your request to speed up our response.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Time Limits
-</h3>
-
-<p class="pb-4 text-justify">It is our policy to respond to all legitimate requests within one month, however, on occasions it may take longer than a month if your request is particularly complex or you have made a number of requests. In this case, we will notify you and keep you updated throughout the process.</p>
diff --git a/resources/views/partials/static-blocks/privacy.blade.php b/resources/views/partials/static-blocks/privacy.blade.php
new file mode 100644
index 00000000..030836cb
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy.blade.php
@@ -0,0 +1,11 @@
+@include('partials.static-blocks.privacy.intro')
+@include('partials.static-blocks.privacy.data-we-may-collect')
+@include('partials.static-blocks.privacy.how-we-collect-your-data')
+@include('partials.static-blocks.privacy.how-we-use-your-data')
+@include('partials.static-blocks.privacy.how-we-store-your-data')
+@include('partials.static-blocks.privacy.retention')
+@include('partials.static-blocks.privacy.marketing')
+@include('partials.static-blocks.privacy.cookies')
+@include('partials.static-blocks.privacy.your-data-protection-rights')
+@include('partials.static-blocks.privacy.how-to-contact-us')
+@include('partials.static-blocks.privacy.ico-complaints')
diff --git a/resources/views/partials/static-blocks/privacy/cookies.blade.php b/resources/views/partials/static-blocks/privacy/cookies.blade.php
new file mode 100644
index 00000000..264769cc
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/cookies.blade.php
@@ -0,0 +1,48 @@
+<h3 class="text-small-print">
+    COOKIES
+</h3>
+
+<p class="text-small-print">
+    This site uses necessary first-party cookies for anti-forgery to prevent attacks.
+    If you consent to us storing an acknowledgement of this on your device,
+    by selecting 'Remember my choice' when accepting the app's cookie notification form,
+    then we will also store a first-party cookie to record this consent on your device.
+</p>
+
+<table class="text-small-print">
+    <thead>
+        <tr>
+            <th>Cookie</th>
+            <th>Common Name</th>
+            <th>Purpose</th>
+            <th>Storage Conditions</th>
+            <th>Expiry</th>
+        </tr>
+    </thead>
+
+    <tbody>
+        <tr>
+            <td>{{ Str::slug(config('app.name'), '_') . '_session' }}</td>
+            <td><strong>Session Token</strong></td>
+            <td>Identifier to help preserve client-side state</td>
+            <td><em>On use of the website</em></td>
+            <td>{{ config('session.lifetime') }} minutes after last use of the website</td>
+        </tr>
+
+        <tr>
+            <td>XSRF-TOKEN</td>
+            <td><strong>XSRF Token</strong></td>
+            <td>Identifier to help prevent cross-site request forgery</td>
+            <td><em>On use of the website</em></td>
+            <td>{{ config('session.lifetime') }} minutes after last use of the website</td>
+        </tr>
+
+        <tr>
+            <td>consent-storage-granted</td>
+            <td><strong>Storage Consent Token</strong></td>
+            <td>Identifier to record consent for storing cookies on this device</td>
+            <td><em>On indication of consent</em></td>
+            <td>365 x 24 hours from the time the relevant consent was indicated, or until this policy changes, whichever is sooner</td>
+        </tr>
+    </tbody>
+</table>
diff --git a/resources/views/partials/static-blocks/privacy/data-we-may-collect.blade.php b/resources/views/partials/static-blocks/privacy/data-we-may-collect.blade.php
new file mode 100644
index 00000000..07231b61
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/data-we-may-collect.blade.php
@@ -0,0 +1,44 @@
+<h3 class="text-small-print">
+    DATA WE MAY COLLECT
+</h3>
+
+<p class="text-small-print">
+    We may collect, use, store and/or transfer data depending on the product or service you are accessing,
+    the different kinds of personal data are grouped together as follows:
+</p>
+
+<ul class="text-small-print">
+    <li>
+        <strong>Identity Data</strong> – which includes your name, username or similar identifier, marital status, title, date of birth and gender.
+    </li>
+
+    <li>
+        <strong>Profile Data</strong> - which includes your username and password for any accounts set up to access our services or provide feedback responses.
+    </li>
+
+    <li>
+        <strong>Contact Data</strong> – which includes telephone numbers, and physical and digital addresses.
+    </li>
+
+    <li>
+        <strong>Usage Data</strong> – which includes information about how you use our site, products and services.
+    </li>
+
+    <li>
+        <strong>Marketing and Communications Data</strong> – which includes your preferences in receiving marketing from us and our third parties
+        and your communication preferences.
+    </li>
+
+    <li>
+        <strong>Technical Data</strong> – includes internet protocol (IP) address, your login data, browser type and version, time zone setting and location,
+        browser plug-in types and versions, operating system and platform and other technology on the devices you use to access the site.
+    </li>
+
+    <li>
+        <strong>Financial Data</strong> – which includes your bank account and payment card details.
+    </li>
+
+    <li>
+        <strong>Transaction Data</strong> – includes details about payments to and from you and other details of products and services you have purchased from us.
+    </li>
+</ul>
diff --git a/resources/views/partials/static-blocks/privacy/how-to-contact-us.blade.php b/resources/views/partials/static-blocks/privacy/how-to-contact-us.blade.php
new file mode 100644
index 00000000..6addaf5f
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-to-contact-us.blade.php
@@ -0,0 +1,9 @@
+<h3 class="text-small-print">
+    HOW TO CONTACT US
+</h3>
+
+<p class="text-small-print">
+    If you have any questions about our privacy policy, the data we hold on you,
+    or you would like to exercise one of your data protection rights,
+    please contact us using the contact form on this website.
+</p>
diff --git a/resources/views/partials/static-blocks/privacy/how-we-collect-your-data.blade.php b/resources/views/partials/static-blocks/privacy/how-we-collect-your-data.blade.php
new file mode 100644
index 00000000..4fd1cf26
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-we-collect-your-data.blade.php
@@ -0,0 +1,21 @@
+<h3 class="text-small-print">
+    HOW WE COLLECT YOUR DATA
+</h3>
+
+<p class="text-small-print">You directly provide us with most of the data we collect. We collect data and process data when you:</p>
+
+<ul class="text-small-print">
+    <li>Interact with the website.</li>
+    <li>Make a request for our products/services.</li>
+    <li>Requesting marketing communication to be sent to you or others you are acting on behalf of.</li>
+    <li>Voluntarily complete a customer survey or provide feedback on any of our message boards or via email.</li>
+    <li>Correspond with us online or by any other method.</li>
+</ul>
+
+<p class="text-small-print">We may also receive your data indirectly from the following sources:</p>
+
+<ul class="text-small-print">
+    <li>Third parties or publicly available sources – personal data about you may be received through various third parties and public sources
+        such as analytics providers, advertising networks and/or search information providers based inside the European Economic Area (EEA).</li>
+    <li>Contact, Financial and Transaction Data (if applicable) from providers of technical, payment and delivery services inside the EEA.</li>
+</ul>
diff --git a/resources/views/partials/static-blocks/privacy/how-we-store-your-data.blade.php b/resources/views/partials/static-blocks/privacy/how-we-store-your-data.blade.php
new file mode 100644
index 00000000..829a49f1
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-we-store-your-data.blade.php
@@ -0,0 +1,12 @@
+<h3 class="text-small-print">
+    How We Store Your Data
+</h3>
+
+<p class="text-small-print">
+    Keeping your data secure is important to us,
+    we therefore have in place appropriate security measure to prevent unauthorised access,
+    accidental loss, alteration or disclosure.
+    In addition to this we limit access to your personal data to those employees, agents,
+    contractors and other third parties who have a business need to know,
+    in accordance with this policy and subject to a duty of confidentiality.
+</p>
diff --git a/resources/views/partials/static-blocks/privacy/how-we-use-your-data.blade.php b/resources/views/partials/static-blocks/privacy/how-we-use-your-data.blade.php
new file mode 100644
index 00000000..1935e59f
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-we-use-your-data.blade.php
@@ -0,0 +1,28 @@
+<h3 class="text-small-print">
+    HOW WE USE YOUR DATA
+</h3>
+
+<p class="text-small-print">
+    We may use your data for the following reasons:
+</p>
+
+<ul class="text-small-print">
+    <li><strong>Consent</strong> - you have given clear consent for us to process your personal data for a specific purpose.</li>
+    <li><strong>Contract</strong> - processing is necessary for a contract we have with you, or because you have asked us to take specific steps
+        before entering into a contract.</li>
+    <li><strong>Legal obligation</strong> - it is necessary for us to comply with a legal or regulatory obligation (not including contractual obligations).</li>
+    <li><strong>Vital interests</strong> - processing is necessary to protect someone’s life.</li>
+    <li>
+        <strong>Legitimate interests</strong> - processing is necessary for our legitimate interests (for example to administer and maintain our website(s))
+        or the legitimate interests of a third party unless there is a good reason to protect your personal data which overrides those legitimate interests.
+        We make sure we consider and balance any potential impact on you (both positive and negative) and your rights before we process your personal data
+        for our legitimate interests. We do not use your personal data for activities where our interests are overridden by the impact on you
+        (unless we have your consent or are otherwise required or permitted to by law). We rely on the following interests when processing your personal data:
+
+        <ul>
+            <li>To manage our business and comply with our obligations to our customers, staff and suppliers.</li>
+            <li>To protect our proprietary and commercially sensitive information.</li>
+            <li>To administer and maintain our websites.</li>
+        </ul>
+    </li>
+</ul>
diff --git a/resources/views/partials/static-blocks/privacy/ico-complaints.blade.php b/resources/views/partials/static-blocks/privacy/ico-complaints.blade.php
new file mode 100644
index 00000000..a7bbb11d
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/ico-complaints.blade.php
@@ -0,0 +1,13 @@
+<h3 class="text-small-print">
+    ICO COMPLAINTS
+</h3>
+
+<p class="text-small-print">
+    If you are unhappy with how we are processing your personal data, you have the right to complain to the Information Commissioner's Office (ICO).
+    The Information Commissioner can be contacted at:
+    <a
+        href="https://ico.org.uk/make-a-complaint/"
+        target="_blank"
+        rel="noopener noreferrer"
+    ><u>ico.org.uk/make-a-complaint</u></a>.
+</p>
diff --git a/resources/views/partials/static-blocks/privacy/intro.blade.php b/resources/views/partials/static-blocks/privacy/intro.blade.php
new file mode 100644
index 00000000..913e843c
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/intro.blade.php
@@ -0,0 +1,9 @@
+<p class="text-small-print">
+    This privacy policy (“policy”) will help you understand how {{ config('app.name') }} (“our”, “us”, “we”)
+    uses and protects the data you provide to us when you visit and use
+    <a href="{{ route('home') }}"><u>{{ substr(route('home'), strpos(route('home'), '://') + 3) }}</u></a>
+    (“app”, “website”).
+    The policy also applies when you access our products or services, and applies when you correspond with us in person,
+    by letter, by phone, email or any other means.
+    We keep this policy under regular review and publish any updates on this web page.
+</p>
diff --git a/resources/views/partials/static-blocks/privacy/marketing.blade.php b/resources/views/partials/static-blocks/privacy/marketing.blade.php
new file mode 100644
index 00000000..508c1487
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/marketing.blade.php
@@ -0,0 +1,13 @@
+<h3 class="text-small-print">
+    MARKETING
+</h3>
+
+<p class="text-small-print">
+    We would like to send you information about products and services we think you might like.
+</p>
+
+<p class="text-small-print">
+    If you have agreed to receive marketing, you may always opt out at a later date.
+    You can ask us to stop sending you marketing messages at any time by contacting us
+    using the website's contact form or by any other means.
+</p>
diff --git a/resources/views/partials/static-blocks/privacy/retention.blade.php b/resources/views/partials/static-blocks/privacy/retention.blade.php
new file mode 100644
index 00000000..cb3d5437
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/retention.blade.php
@@ -0,0 +1,12 @@
+<h3 class="text-small-print">
+    RETENTION
+</h3>
+
+<p class="text-small-print">
+    Your personal data will only be retained for as long as necessary to fulfil the purposes we collected it for,
+    including for the purposes of satisfying any legal, accounting, or reporting requirements.
+    To determine the appropriate retention period for personal data, we consider the amount, nature, and sensitivity of the personal data,
+    the potential risk of harm from unauthorised use or disclosure of your personal data,
+    the purposes for which we process your personal data and whether we can achieve those purposes through other means,
+    and the applicable legal requirements.
+</p>
diff --git a/resources/views/partials/static-blocks/privacy/your-data-protection-rights.blade.php b/resources/views/partials/static-blocks/privacy/your-data-protection-rights.blade.php
new file mode 100644
index 00000000..eaf3bdd4
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/your-data-protection-rights.blade.php
@@ -0,0 +1,45 @@
+<h3 class="text-small-print">
+    YOUR DATA PROTECTION RIGHTS
+</h3>
+
+<p class="text-small-print">
+    We would like to make sure you are fully aware of all of your data protection rights.
+    Everyone is entitled to the following:
+</p>
+
+<ul class="text-small-print">
+    <li>
+        <strong>The right to access</strong> – you have the right to request we for copies of your personal data.
+        We may charge you a small fee for this service.
+    </li>
+
+    <li>
+        <strong>The right to rectification</strong> – you have the right to request that we correct any information you believe is inaccurate.
+        You also have the right to request we to complete the information you believe is incomplete.
+    </li>
+
+    <li>
+        <strong>The right to erasure</strong> – you have the right to request that we erase your personal data, under certain conditions.
+    </li>
+
+    <li>
+        <strong>The right to restrict processing</strong> – you have the right to request that we restrict the processing of your personal data,
+        under certain conditions.
+    </li>
+
+    <li>
+        <strong>The right to object to processing</strong> – you have the right to object to we’s processing of your personal data,
+        under certain conditions.
+    </li>
+
+    <li>
+        <strong>The right to data portability</strong> – you have the right to request that we transfer the data that we have collected
+        to another organization, or directly to you, under certain conditions.
+    </li>
+</ul>
+
+<p class="text-small-print">
+    We aim to respond to all legitimate requests within one month, however, on occasions it may take longer than a month if your request
+    is particularly complex or you have made a number of requests.
+    In this case, we will notify you and keep you updated throughout the process.
+</p>
diff --git a/resources/views/partials/static-blocks/stack.blade.php b/resources/views/partials/static-blocks/stack.blade.php
index 295acdc2..15902176 100644
--- a/resources/views/partials/static-blocks/stack.blade.php
+++ b/resources/views/partials/static-blocks/stack.blade.php
@@ -1,4 +1,4 @@
-<h3 class="w-full mb-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">Stack</h3>
+<h3 class="w-full my-4 font-semibold text-sm uppercase tracking-widest">Stack</h3>
 
 <p class="mb-4">Running on PHP v{{ $php_version }}</p>
 
diff --git a/routes/web/admin.php b/routes/web/admin.php
index 31e1ff5f..d2e876d1 100644
--- a/routes/web/admin.php
+++ b/routes/web/admin.php
@@ -16,6 +16,7 @@
 Route::prefix('admin')->middleware(['auth', 'verified', 'admin'])->name('admin.')->group(function () {
     /** PageController Routes */
     Route::controller(PageController::class)->group(function () {
+        Route::get('pages/{page}/preview', 'show')->name('page.show');
         Route::get('pages/{page}', 'edit')->name('page.edit');
         Route::patch('pages/{page}', 'update')->name('page.update');
     });
diff --git a/storage/app/seeds/pages.php b/storage/app/seeds/pages.php
index 76957498..343a42dd 100644
--- a/storage/app/seeds/pages.php
+++ b/storage/app/seeds/pages.php
@@ -21,10 +21,8 @@
     [
         'slug' => 'home',
         'title' => config('app.name'),
-        'meta_title' => config('app.name'),
         'meta_description' => config('metadata.description'),
         'meta_keywords' => config('metadata.keywords'),
-        'template' => WebpageTemplate::PUBLIC_INDEX->value,
         'in_sitemap' => 0,
         'is_homepage' => 1,
         'blocks' => [
@@ -51,6 +49,7 @@
                     ',
                 ]),
             ],
+            ['type' => BlockType::SECTION_DIVIDER->value],
             [
                 'type' => BlockType::PANEL_LINKS->value,
                 'data' => json_encode([
@@ -75,18 +74,19 @@
     [
         'slug' => 'about',
         'title' => 'About',
-        'subtitle' => config('app.name'),
-        'content' => '
-            <p class="text-lg text-gray-800 dark:text-gray-200 tracking-widest mb-8 border-l-4 border-gray-900 dark:border-gray-300 p-2 bg-gray-200 dark:bg-gray-800"><em>"Laravel Breeze variant with Vue, Inertia & Tailwind"</em></p>
-        ',
-        'meta_title' => 'About',
         'meta_description' => config('metadata.description'),
-        'template' => WebpageTemplate::PUBLIC_CONTENT->value,
         'blocks' => [
             [
                 'type' => BlockType::WYSIWYG->value,
                 'data' => json_encode([
                     'html' => '
+                        <h2 class="text-page-title">ABOUT</h2>
+                        <p class="text-page-subtitle">' . config('app.name') . '</p>
+                        <blockquote>
+                            <p>
+                                <i>“Laravel Breeze variant with Vue, Inertia &amp; Tailwind”&nbsp;</i>
+                            </p>
+                        </blockquote>
                         <p>
                             Bassform is a light-weight template for scaffolding
                             <a href="https://laravel.com/" target="_blank" rel="noopener noreferrer"><i>Laravel</i></a> apps,
@@ -113,21 +113,39 @@
     [
         'slug' => 'controls',
         'title' => 'Controls',
-        'subtitle' => 'The UI control components that come with the template are demonstrated below.',
-        'meta_title' => 'Controls',
         'meta_description' => $description_controls,
         'template' => WebpageTemplate::PUBLIC_CONTENT_CONTROLS->value,
         'blocks' => [
+            [
+                'type' => BlockType::WYSIWYG->value,
+                'data' => json_encode([
+                    'html' => '
+                        <h2 class="text-page-title">CONTROLS</h2>
+                        <p class="text-page-subtitle">The UI control components that come with the template are demonstrated below</p>
+                    ',
+                ])
+            ],
+            ['type' => BlockType::SECTION_DIVIDER->value],
         ],
     ],
 
     [
         'slug' => 'forms',
         'title' => 'Forms',
-        'subtitle' => 'The UI form & input components that come with the template are demonstrated below.',
-        'meta_title' => 'Forms',
         'meta_description' => $description_forms,
         'template' => WebpageTemplate::PUBLIC_CONTENT_FORMS->value,
+        'blocks' => [
+            [
+                'type' => BlockType::WYSIWYG->value,
+                'data' => json_encode([
+                    'html' => '
+                        <h2 class="text-page-title">FORMS</h2>
+                        <p class="text-page-subtitle">The UI form & input components that come with the template are demonstrated below</p>
+                    ',
+                ])
+            ],
+            ['type' => BlockType::SECTION_DIVIDER->value],
+        ],
     ],
 
 ];
diff --git a/tests/Browser/Pages/Guest/PageView.php b/tests/Browser/Pages/Guest/PageView.php
index 129db7bd..d3098302 100644
--- a/tests/Browser/Pages/Guest/PageView.php
+++ b/tests/Browser/Pages/Guest/PageView.php
@@ -27,7 +27,7 @@ public function assert(Browser $browser): void
         $browser
             ->assertHasLoadedCorrectly($this->url())
             ->assertHasCorrectCookies()
-            ->assertHasRenderedCorrectly($this->page->getMetaTitle())
+            ->assertHasRenderedCorrectly($this->page->getTitle())
 
             ->pause(config('tests.dusk.pause_length'));
     }
diff --git a/tests/Browser/TestContent/Admin/PageAdminTest.php b/tests/Browser/TestContent/Admin/PageAdminTest.php
index 3c498e73..532d67d8 100644
--- a/tests/Browser/TestContent/Admin/PageAdminTest.php
+++ b/tests/Browser/TestContent/Admin/PageAdminTest.php
@@ -20,16 +20,12 @@ public function testAdminPageEdit(): void
         $initial_array = [
             'in_sitemap' => 0,
             'meta_description' => 'Old meta-description.',
-            'meta_title' => 'Old Title',
-            'subtitle' => 'Old subtitle',
             'title' => 'Old Title',
         ];
 
         $expected_array = [
             'title' => 'New Title',
-            'subtitle' => 'New subtitle',
-            'metaTitle' => 'New meta-title',
-            'metaDescription' => 'New meta-description.',
+            'metaDescription' => 'New description.',
             'inSitemap' => ['type' => 'checkbox'],
         ];
 
@@ -37,8 +33,6 @@ public function testAdminPageEdit(): void
         $user = User::factory()->isAdmin()->create();
 
         Assert::assertTrue($page->title === $initial_array['title']);
-        Assert::assertTrue($page->subtitle === $initial_array['subtitle']);
-        Assert::assertTrue($page->meta_title === $initial_array['meta_title']);
         Assert::assertTrue($page->meta_description === $initial_array['meta_description']);
         Assert::assertFalse($page->in_sitemap);
 
@@ -46,7 +40,9 @@ public function testAdminPageEdit(): void
             ->loginAs($user)
 
             ->visit(new AdminEditPage($page))
-            ->screenshotWholePage('admin-pages-edit-blank')
+            ->screenshotWholePage('admin-pages-edit-content-blank')
+            ->press('META DATA')
+            ->screenshotWholePage('admin-pages-edit-metadata-blank')
             ->completeForm('form', $expected_array)
             ->screenshotWholePage('admin-pages-edit-filled')
             ->submitForm('form')
diff --git a/tests/Browser/TestContent/Guest/PrivacyPageTest.php b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
index f089a9b3..0056716b 100644
--- a/tests/Browser/TestContent/Guest/PrivacyPageTest.php
+++ b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
@@ -14,7 +14,7 @@ final class PrivacyPageTest extends DuskTestCase
 {
     use DatabaseTruncation;
 
-    /** Test the about page renders & behaves correctly. */
+    /** Test the privacy page renders & behaves correctly. */
     public function testPrivacyPageContentWithoutPageModel(): void
     {
         $page = Page::factory()->privacyPage()->make();
@@ -25,16 +25,15 @@ public function testPrivacyPageContentWithoutPageModel(): void
         );
     }
 
-    /** Test the about page renders & behaves correctly with a page model. */
+    /** Test the privacy page renders & behaves correctly with a page model. */
     public function testPrivacyPageContentWithPageModel(): void
     {
         (new PageSeeder)->run();
-        $page = Page::where('slug', 'privacy')->first() ?? Page::factory()->create(['slug' => 'privacy']);
+        $page = Page::where('slug', 'privacy')->first() ?? Page::factory()->privacyPage()->create();
         Assert::assertEquals(Page::where('slug', 'privacy')->count(), 1);
 
         $this->browse(fn (Browser $browser) => $browser
             ->visit(new PageView($page))
-            ->assertSee(strtoupper($page->getTitle()))
         );
     }
 }
diff --git a/tests/Datasets/PageArraysUpdateInvalid.php b/tests/Datasets/PageArraysUpdateInvalid.php
index ec3fa0b4..7fd023fc 100644
--- a/tests/Datasets/PageArraysUpdateInvalid.php
+++ b/tests/Datasets/PageArraysUpdateInvalid.php
@@ -2,6 +2,7 @@
 
 $standard_array = [
     'title' => 'Title',
+    'webpageStatusId' => 1,
     'inSitemap' => true,
 ];
 
@@ -11,11 +12,12 @@
             [],
             [
                 'title' => 'The title field is required.',
+                'webpageStatusId' => 'The webpage status id field is required.',
                 'inSitemap' => 'The in sitemap field is required.',
             ],
         ],
         'title missing' => [
-            ['inSitemap' => true],
+            ['webpageStatusId' => 1, 'inSitemap' => true],
             ['title' => 'The title field is required.'],
         ],
         'title empty' => [
@@ -30,26 +32,6 @@
             array_merge($standard_array, ['title' => str_pad('', 256, 'a')]),
             ['title' => 'The title field must not be greater than 255 characters.'],
         ],
-        'subtitle not string' => [
-            array_merge($standard_array, ['subtitle' => 1]),
-            ['subtitle' => 'The subtitle field must be a string.'],
-        ],
-        'subtitle >255 characters' => [
-            array_merge($standard_array, ['subtitle' => str_pad('', 256, 'a')]),
-            ['subtitle' => 'The subtitle field must not be greater than 255 characters.'],
-        ],
-        'content not string' => [
-            array_merge($standard_array, ['content' => 1]),
-            ['content' => 'The content field must be a string.'],
-        ],
-        'metaTitle not string' => [
-            array_merge($standard_array, ['metaTitle' => 1]),
-            ['metaTitle' => 'The meta title field must be a string.'],
-        ],
-        'metaTitle >255 characters' => [
-            array_merge($standard_array, ['metaTitle' => str_pad('', 256, 'a')]),
-            ['metaTitle' => 'The meta title field must not be greater than 255 characters.'],
-        ],
         'metaDescription not string' => [
             array_merge($standard_array, ['metaDescription' => 1]),
             ['metaDescription' => 'The meta description field must be a string.'],
@@ -58,8 +40,24 @@
             array_merge($standard_array, ['metaDescription' => str_pad('', 256, 'a')]),
             ['metaDescription' => 'The meta description field must not be greater than 255 characters.'],
         ],
+        'webpageStatusId missing' => [
+            ['title' => 'Title', 'inSitemap' => true],
+            ['webpageStatusId' => 'The webpage status id field is required.'],
+        ],
+        'webpageStatusId empty' => [
+            array_merge($standard_array, ['webpageStatusId' => '']),
+            ['webpageStatusId' => 'The webpage status id field is required.'],
+        ],
+        'webpageStatusId not integer' => [
+            array_merge($standard_array, ['webpageStatusId' => 'a']),
+            ['webpageStatusId' => 'The webpage status id field must be an integer.'],
+        ],
+        'webpageStatusId > max WebpageStatus' => [
+            array_merge($standard_array, ['webpageStatusId' => 42]),
+            ['webpageStatusId' => 'The webpage status id field must not be greater than 2.'],
+        ],
         'inSitemap missing' => [
-            ['title' => 'Title'],
+            ['title' => 'Title', 'webpageStatusId' => 1],
             ['inSitemap' => 'The in sitemap field is required.'],
         ],
         'inSitemap empty' => [
diff --git a/tests/Datasets/PageGhosts.php b/tests/Datasets/PageGhosts.php
index 9ec45969..1db1e3ed 100644
--- a/tests/Datasets/PageGhosts.php
+++ b/tests/Datasets/PageGhosts.php
@@ -7,6 +7,7 @@
         'new model' => [fn () => new Page],
         'page ghost min record' => [fn () => Page::factory()->make()],
         'page ghost max random record' => [fn () => Page::factory()->dummy()->make()],
+        'page ghost draft' => [fn () => Page::factory()->draft()->make()],
         'homepage ghost' => [fn () => Page::factory()->dummy()->homePage()->make()],
         'privacy page ghost' => [fn () => Page::factory()->dummy()->privacyPage()->make()],
     ];
diff --git a/tests/Datasets/Pages.php b/tests/Datasets/Pages.php
index 1b5afa6d..8135029e 100644
--- a/tests/Datasets/Pages.php
+++ b/tests/Datasets/Pages.php
@@ -30,6 +30,7 @@
     return [
         'page min record' => [fn () => Page::factory()->create()],
         'page max random record' => [fn () => Page::factory()->dummy()->create()],
+        'page draft' => [fn () => Page::factory()->draft()->create()],
         'homepage' => [fn () => Page::factory()->homePage()->create()],
         'about page' => [fn () => Page::factory()->aboutPage()->create()],
         'privacy page' => [fn () => Page::factory()->privacyPage()->create()],
diff --git a/tests/Enums/ExampleBlock.php b/tests/Enums/ExampleBlock.php
index df259653..efd57b0b 100644
--- a/tests/Enums/ExampleBlock.php
+++ b/tests/Enums/ExampleBlock.php
@@ -10,6 +10,7 @@ enum ExampleBlock: string
     /* List of the example content blocks available for tests. */
     case HEADER_LOGO = 'header-logo';
     case PANEL_LINKS = 'panel-links';
+    case PRIVACY_POLICY = 'privacy-policy';
     case SECTION_DIVIDER = 'section-divider';
     case STACK = 'stack';
     case TABS = 'tabs';
@@ -43,6 +44,7 @@ public function exampleData(): ?array
                     ],
                 ],
             ],
+            self::PRIVACY_POLICY => null,
             self::SECTION_DIVIDER => null,
             self::STACK => null,
             self::TABS => [
diff --git a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
index 4965f97c..a1b5e62b 100644
--- a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
@@ -6,6 +6,7 @@
 use App\Http\Requests\Admin\PageUpdateRequest;
 use App\Http\Resources\Views\Admin\Pages\CreateEditPageResource;
 use App\Http\Resources\Views\DetailsViewResource;
+use App\Http\Resources\Views\Public\Content\PageContentResource;
 use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
 use App\Models\Page;
 use App\Models\User;
@@ -14,6 +15,50 @@
     ->expect(PageController::class)
     ->toExtend(Controller::class);
 
+test('show renders the page preview view', function (Page $page) {
+    $route = route('admin.page.show', [$page]);
+    $user = User::factory()->isAdmin()->create();
+    $actual = $this->actingAs($user)->get($route);
+    $session = session()->all();
+    $headers = $actual->headers->all();
+
+    $actual
+        ->assertStatus(200)
+        ->assertSessionHasNoErrors()
+        ->assertViewIs('app');
+
+    expect($session)->toHaveCorrectSessionValues($route);
+
+    expect($headers)->toHaveCorrectHeaderValues();
+
+    $data = (new DetailsViewResource)->getItem(
+        (new PageContentResource($page))->getItem(),
+        (new PageMetadataResource)->getItem($page)
+    );
+
+    expect($actual)
+        ->toHaveCorrectHtmlHead($page->template)
+        ->toHaveCorrectHtmlBody()
+        ->toHaveCorrectPropsDetails(
+            $page->template,
+            $data['content'],
+            $data['metadata']
+        );
+})->with('pages');
+
+test('show renders the 404 view for unknown pages', function () {
+    $url = url('admin/pages/101/preview');
+    $user = User::factory()->isAdmin()->create();
+    $actual = $this->actingAs($user)->get($url);
+    $session = session()->all();
+
+    $actual
+        ->assertStatus(404)
+        ->assertSessionHasNoErrors();
+
+    expect($session)->toHaveCorrectSessionValues($url);
+});
+
 test('edit renders the page create/edit view', function (Page $page) {
     $route = route('admin.page.edit', [$page]);
     $user = User::factory()->isAdmin()->create();
@@ -71,6 +116,7 @@
     $user = User::factory()->isAdmin()->create();
     $data = [
         'title' => $page->getTitle() . ' - UPDATED',
+        'webpageStatusId' => $page->webpage_status_id,
         'inSitemap' => (bool) $page->in_sitemap,
     ];
 
@@ -87,10 +133,8 @@
     $page->refresh();
 
     expect($page->title)->toEqual($data['title']);
-    expect($page->subtitle)->toEqual($page_original->subtitle);
-    expect($page->content)->toEqual($page_original->content);
-    expect($page->meta_title)->toEqual($page_original->meta_title);
     expect($page->meta_description)->toEqual($page_original->meta_description);
+    expect($page->webpage_status_id)->toEqual($page_original->webpage_status_id);
     expect($page->in_sitemap)->toEqual($page_original->in_sitemap);
     expect($page->blocks)->toEqual($page_original->blocks);
 })->with('pages');
@@ -101,10 +145,8 @@
     $user = User::factory()->isAdmin()->create();
     $data = [
         'title' => 'New Title',
-        'subtitle' => 'New Subtitle',
-        'content' => '<p>New content.</p>',
-        'metaTitle' => 'New Meta-Title',
         'metaDescription' => 'New Meta-Description',
+        'webpageStatusId' => $page->webpage_status_id !== 1 ? 1 : 2,
         'inSitemap' => !$page->in_sitemap,
     ];
 
@@ -121,10 +163,8 @@
     $page->refresh();
 
     expect($page->title)->toEqual($data['title']);
-    expect($page->subtitle)->toEqual($data['subtitle']);
-    expect($page->content)->toEqual($data['content']);
-    expect($page->meta_title)->toEqual($data['metaTitle']);
     expect($page->meta_description)->toEqual($data['metaDescription']);
+    expect($page->webpage_status_id)->toEqual($data['webpageStatusId']);
     expect($page->in_sitemap)->toEqual($data['inSitemap']);
     expect($page->blocks)->toEqual($page_original->blocks);
 })->with('pages');
@@ -136,6 +176,7 @@
     $user = User::factory()->isAdmin()->create();
     $data = [
         'title' => $page->getTitle() . ' - UPDATED',
+        'webpageStatusId' => $page->webpage_status_id,
         'inSitemap' => (bool) $page->in_sitemap,
         'unknownField' => 'invalid value',
     ];
@@ -155,10 +196,8 @@
     /** @phpstan-ignore-next-line (Intentionally accessing undefined property as part of the test.) */
     expect($page->unknown_field)->toBeNull();
     expect($page->title)->toEqual($data['title']);
-    expect($page->subtitle)->toEqual($page_original->subtitle);
-    expect($page->content)->toEqual($page_original->content);
-    expect($page->meta_title)->toEqual($page_original->meta_title);
     expect($page->meta_description)->toEqual($page_original->meta_description);
+    expect($page->webpage_status_id)->toEqual($page_original->webpage_status_id);
     expect($page->in_sitemap)->toEqual($page_original->in_sitemap);
     expect($page->blocks)->toEqual($page_original->blocks);
 });
diff --git a/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php b/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php
index ea6647e7..38ecbeb0 100644
--- a/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php
@@ -28,10 +28,10 @@
     );
 
     expect($actual)
-        ->toHaveCorrectHtmlHead(WebpageTemplate::PUBLIC_INDEX->value)
+        ->toHaveCorrectHtmlHead(WebpageTemplate::PUBLIC_CONTENT->value)
         ->toHaveCorrectHtmlBody()
         ->toHaveCorrectPropsDetails(
-            WebpageTemplate::PUBLIC_INDEX->value,
+            WebpageTemplate::PUBLIC_CONTENT->value,
             $data['content'],
             $data['metadata']
         );
diff --git a/tests/Feature/Http/Controllers/Public/PageControllerTest.php b/tests/Feature/Http/Controllers/Public/PageControllerTest.php
index 30e48e0c..f33b9f5c 100644
--- a/tests/Feature/Http/Controllers/Public/PageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/PageControllerTest.php
@@ -16,7 +16,15 @@
     $actual = $this->get($route);
     $session = session()->all();
     $headers = $actual->headers->all();
-    $status = $page->is_homepage ? 302 : 200;
+    $status = 200;
+
+    if (!$page->isPublished()) {
+        $status = 404;
+    }
+
+    if ($page->is_homepage) {
+        $status = 302;
+    }
 
     $actual
         ->assertStatus($status)
diff --git a/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php b/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php
index 5022e617..b2ae21cd 100644
--- a/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php
@@ -37,7 +37,7 @@
 });
 
 it('can render the privacy page view with a Page model', function () {
-    $page = Page::factory()->create(['slug' => 'privacy']);
+    $page = Page::factory()->privacyPage()->create();
     $route = route('privacy');
     $actual = $this->get($route);
     $session = session()->all();
diff --git a/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php b/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php
index 72d5dae0..3a9c2d25 100644
--- a/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php
@@ -26,9 +26,6 @@
 test('show can render the general pages sitemap view', function () {
     Page::factory()->create([
         'slug' => 'test-page',
-        'meta_description' => 'Test page example meta-description.',
-        'meta_keywords' => 'test, page, keywords',
-        'meta_title' => 'Test Page',
     ]);
 
     $route = route('sitemap.show', 'pages');
diff --git a/tests/Unit/App/Http/HttpArchitectureTest.php b/tests/Unit/App/Http/HttpArchitectureTest.php
index 50994fda..e47c2e1e 100644
--- a/tests/Unit/App/Http/HttpArchitectureTest.php
+++ b/tests/Unit/App/Http/HttpArchitectureTest.php
@@ -90,11 +90,6 @@
     ->toHaveSuffix('MetadataResource')
     ->tohaveMethod('getItem');
 
-arch('app/Http/Resources/Views/Public/Summaries has valid architecture')
-    ->expect('App\Http\Resources\Views\Public\Summaries')
-    ->toHaveSuffix('SummaryResource')
-    ->tohaveMethod('getItem');
-
 arch('app/Http/Resources/Views/Sitemaps has valid architecture')
     ->expect('App\Http\Resources\Views\Sitemaps')
     ->toHaveSuffix('SitemapResource');
diff --git a/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php b/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
index 55596725..af55ba8c 100644
--- a/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
+++ b/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
@@ -26,21 +26,6 @@
             'string',
             'max:255',
         ],
-        'subtitle' => [
-            'nullable',
-            'string',
-            'max:255',
-        ],
-        'content' => [
-            'nullable',
-            'string',
-            'max:5120',
-        ],
-        'metaTitle' => [
-            'nullable',
-            'string',
-            'max:255',
-        ],
         'metaDescription' => [
             'nullable',
             'string',
@@ -50,5 +35,10 @@
             'required',
             'boolean',
         ],
+        'webpageStatusId' => [
+            'required',
+            'integer',
+            'max:2',
+        ],
     ], $actual);
 });
diff --git a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
index 0451acdc..06a73422 100644
--- a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Http\Resources\Views\Admin\Blocks\AdminBlocksResource;
 use App\Http\Resources\Views\Admin\Pages\CreateEditPageResource;
 use App\Interfaces\Resources\Items\PageItemInterface;
@@ -17,16 +18,16 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(8)
+        ->toHaveCount(7)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
-            'content' => $page->getContent(),
-            'subtitle' => $page->getSubtitle(),
             'title' => $page->getTitle(),
-            'metaTitle' => $page->getMetaTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'slug' => $page->slug,
+            'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
+                ?? WebpageStatus::DRAFT->value,
         ]);
 })->with('pages');
 
@@ -35,15 +36,15 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(8)
+        ->toHaveCount(7)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
-            'content' => $page->getContent(),
-            'subtitle' => $page->getSubtitle(),
             'title' => $page->getTitle(),
-            'metaTitle' => $page->getMetaTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'slug' => $page->slug,
+            'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
+                ?? WebpageStatus::DRAFT->value,
         ]);
 })->with('page-ghosts');
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
index 7eaadff0..2a5d0c99 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
@@ -21,7 +21,7 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4);
+        ->toHaveCount(1);
 });
 
 test('getItem returns ok with a Page Model', function () {
@@ -39,12 +39,9 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4)
+        ->toHaveCount(1)
         ->toMatchArray([
             'blocks' => [],
-            'bodytext' => $page->content,
-            'heading' => $page->title,
-            'subheading' => $page->subtitle,
         ]);
 });
 
@@ -52,14 +49,14 @@
     $actual = (new HomepageContentResource)->getTemplate();
 
     expect($actual?->value)
-        ->toEqual('Public/PublicHomepage');
+        ->toEqual(WebpageTemplate::PUBLIC_CONTENT->value);
 });
 
 it('initialises with setDefaultModel ok', function () {
     $actual = new HomepageContentResource;
 
     expect($actual->getTemplate()?->value)
-        ->toEqual(WebpageTemplate::PUBLIC_INDEX->value);
+        ->toEqual(WebpageTemplate::PUBLIC_CONTENT->value);
 
     expect($actual->getItem()['blocks'])
         ->toHaveCamelCaseKeys()
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php
index 33814a52..7ec93a9a 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php
@@ -12,11 +12,8 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4)
+        ->toHaveCount(1)
         ->toMatchArray([
             'blocks' => [],
-            'bodytext' => null,
-            'heading' => '',
-            'subheading' => '',
         ]);
 });
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
new file mode 100644
index 00000000..557a5ad6
--- /dev/null
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
@@ -0,0 +1,44 @@
+<?php
+
+use App\Http\Resources\Views\Public\Content\PrivacyPolicyContentResource;
+use App\Interfaces\Resources\Items\ConstantItemInterface;
+use App\Models\Page;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+arch('it implements the expected interface')
+    ->expect(PrivacyPolicyContentResource::class)
+    ->toImplement(ConstantItemInterface::class);
+
+test('getItem returns ok without a Page Model', function () {
+    $actual = (new PrivacyPolicyContentResource)->getItem();
+
+    expect($actual['blocks'])
+        ->toBeArray()
+        ->toHaveCount(3);
+
+    expect($actual)
+        ->toHaveCamelCaseKeys()
+        ->toHaveCount(1);
+});
+
+test('getItem returns ok with a Page Model', function () {
+    $page = Page::factory()->create([
+        'title' => 'Privacy Policy',
+        'slug' => 'privacy',
+    ]);
+
+    $actual = (new PrivacyPolicyContentResource($page))->getItem();
+
+    expect($actual['blocks'])
+        ->toBeArray()
+        ->toBeEmpty();
+
+    expect($actual)
+        ->toHaveCamelCaseKeys()
+        ->toHaveCount(1)
+        ->toMatchArray([
+            'blocks' => [],
+        ]);
+});
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php
index fc7dd256..df9d5c5d 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php
@@ -10,8 +10,8 @@
 beforeEach(function () {
     $this->page = Page::factory()->create([
         'slug' => 'test-page',
+        'title' => 'Test Page',
         'meta_description' => 'Test page example meta-description.',
-        'meta_title' => 'Test Page',
     ]);
 });
 
@@ -28,6 +28,6 @@
         ->toMatchArray([
             'canonical' => url($this->page->slug),
             'description' => $this->page->getMetaDescription(),
-            'title' => $this->page->getMetaTitle(),
+            'title' => $this->page->getTitle(),
         ]);
 });
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Summaries/PageSummaryResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Summaries/PageSummaryResourceTest.php
deleted file mode 100644
index bef34b0b..00000000
--- a/tests/Unit/App/Http/Resources/Views/Public/Summaries/PageSummaryResourceTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-use App\Http\Resources\Views\Public\Summaries\PageSummaryResource;
-use App\Interfaces\Resources\Items\PageItemInterface;
-use App\Models\Page;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-
-uses(RefreshDatabase::class);
-
-arch('it implements the expected interface')
-    ->expect(PageSummaryResource::class)
-    ->toImplement(PageItemInterface::class);
-
-test('getItem returns ok', function (Page $page) {
-    $actual = (new PageSummaryResource)->getItem($page);
-
-    expect($actual)
-        ->toHaveCamelCaseKeys()
-        ->toHaveCount(3)
-        ->toMatchArray([
-            'content' => $page->getMetaDescription(),
-            'title' => $page->getTitle(),
-            'url' => $page->getUrl(),
-        ]);
-})->with('pages');
diff --git a/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php b/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php
index 21416a1c..a34b55ae 100644
--- a/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php
@@ -10,9 +10,6 @@
 beforeEach(function () {
     $this->page = Page::factory()->create([
         'slug' => 'test-page',
-        'meta_description' => 'Test page example meta-description.',
-        'meta_keywords' => 'test, page, keywords',
-        'meta_title' => 'Test Page',
     ]);
 });
 
diff --git a/tests/Unit/App/Services/Admin/PageAdminServiceTest.php b/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
index 0a53b2a5..e9eaa68d 100644
--- a/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
+++ b/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
@@ -24,11 +24,9 @@
     expect($page)
         ->not->toBeNull()
         ->title->toEqual($data['title'])
-        ->subtitle->toEqual($page_original->subtitle)
-        ->content->toEqual($page_original->content)
-        ->meta_title->toEqual($page_original->meta_title)
         ->meta_description->toEqual($page_original->meta_description)
         ->in_sitemap->toEqual($page_original->in_sitemap)
+        ->webpage_status_id->toEqual($page_original->webpage_status_id)
         ->template->toEqual($page_original->template)
         ->blocks->toEqual($page_original->blocks);
 })->with('pages');
@@ -48,10 +46,8 @@
     }
 
     $data = [
+        'webpageStatusId' => $page->webpage_status_id === 1 ? 2 : 1,
         'title' => 'New Title',
-        'subtitle' => 'New Subtitle',
-        'content' => '<p>New content.</p>',
-        'metaTitle' => 'New Meta-Title',
         'metaDescription' => 'New Meta-Description',
         'inSitemap' => !$page->in_sitemap,
         'blocks' => $blocks_array,
@@ -66,11 +62,9 @@
     expect($page)
         ->not->toBeNull()
         ->title->toEqual($data['title'])
-        ->subtitle->toEqual($data['subtitle'])
-        ->content->toEqual($data['content'])
-        ->meta_title->toEqual($data['metaTitle'])
         ->meta_description->toEqual($data['metaDescription'])
         ->in_sitemap->toEqual($data['inSitemap'])
+        ->webpage_status_id->toEqual($data['webpageStatusId'])
         ->template->toEqual($page_original->template);
 })->with('pages');
 
@@ -95,11 +89,9 @@
     expect($page)
         ->not->toBeNull()
         ->title->toEqual($data['title'])
-        ->subtitle->toEqual($page_original->subtitle)
-        ->content->toEqual($page_original->content)
-        ->meta_title->toEqual($page_original->meta_title)
         ->meta_description->toEqual($page_original->meta_description)
         ->in_sitemap->toEqual($page_original->in_sitemap)
+        ->webpage_status_id->toEqual($page_original->webpage_status_id)
         ->template->toEqual($page_original->template)
         ->blocks->toEqual($page_original->blocks);
 });
diff --git a/tests/Unit/Database/Factories/PageFactoryTest.php b/tests/Unit/Database/Factories/PageFactoryTest.php
index 64b01463..65dc59db 100644
--- a/tests/Unit/Database/Factories/PageFactoryTest.php
+++ b/tests/Unit/Database/Factories/PageFactoryTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Models\Page;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -10,11 +11,9 @@
     ->expect(fn () => Page::factory()->make(['title' => 'Test Title']))
     ->title->toEqual('Test Title')
     ->slug->toBeString()
-    ->subtitle->toBeNull()
-    ->content->toBeNull()
-    ->meta_title->toBeNull()
     ->meta_description->toBeNull()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();
 
@@ -22,19 +21,29 @@
     ->expect(fn () => Page::factory()->aboutPage()->make(['title' => 'Test Title']))
     ->title->toEqual('Test Title')
     ->slug->toEqual('about')
-    ->subtitle->toBeString()
-    ->content->toBeString()
-    ->meta_title->toEqual('About')
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();
 
+it('makes draft page models')
+    ->expect(fn () => Page::factory()->draft()->make())
+    ->title->tobeString()
+    ->slug->toBeString()
+    ->meta_description->toBeNull()
+    ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::DRAFT->value)
+    ->in_sitemap->toBeTrue()
+    ->is_homepage->toBeFalse();
+
 it('makes dummy page models')
     ->expect(fn () => Page::factory()->dummy()->make())
-    ->title->tobeString('Test Title')
+    ->title->tobeString()
     ->slug->toBeString()
+    ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();
 
@@ -42,11 +51,9 @@
     ->expect(fn () => Page::factory()->homePage()->make())
     ->title->toBeString()
     ->slug->toEqual('home')
-    ->subtitle->toBeString()
-    ->content->toBeString()
-    ->meta_title->toBeString()
     ->meta_description->toBeString()
-    ->template->toEqual(WebpageTemplate::PUBLIC_INDEX->value)
+    ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeFalse()
     ->is_homepage->toBeTrue();
 
@@ -54,10 +61,8 @@
     ->expect(fn () => Page::factory()->privacyPage()->make())
     ->title->toEqual('Privacy Policy')
     ->slug->toEqual('privacy')
-    ->subtitle->toBeString()
-    ->content->toBeString()
-    ->meta_title->toEqual('Privacy Policy')
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();