diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
index d614a9ec6..46a195f5d 100644
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -4,35 +4,64 @@ rules:
     min: 2
     max: 80
 
+
 form:
   fields:
 
-    folder:
-      type: text
-      label: Folder
-      validate:
-        type: slug
-        required: true
+    tabs:
+      type: tabs
+      active: 1
+
+      fields:
+        content:
+          type: tab
+          title: Content
+
+          fields:
+            content:
+              type: markdown
+              label: Content
+
+
+        options:
+          type: tab
+          title: Options
+
+          fields:
+
+            folder:
+              type: text
+              label: Folder
+              validate:
+                type: slug
+                required: true
+
+            route:
+              type: select
+              label: Parent
+              classes: fancy
+              @data-options: '\Grav\Common\Page\Pages::parents'
+              @data-default: '\Grav\Plugin\admin::route'
+              options:
+                '/': '- Root -'
+              validate:
+                required: true
+
+            type:
+              type: select
+              classes: fancy
+              label: Page Type
+              default: default
+              @data-options: '\Grav\Common\Page\Pages::types'
+              validate:
+                required: true
+
+            frontmatter:
+                type: frontmatter
+                label: Frontmatter
+
 
-    route:
-      type: select
-      label: Parent
-      classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
-      options:
-        '/': '- Root -'
-      validate:
-        required: true
 
-    type:
-      type: select
-      classes: fancy
-      label: Page Type
-      default: default
-      @data-options: '\Grav\Common\Page\Pages::types'
-      validate:
-        required: true
 
 
 
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index e7eca9dcb..f27394f03 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -400,6 +400,10 @@ class Page
         $path = explode('.', $name);
         $scope = array_shift($path);
 
+        if ($name == 'frontmatter') {
+            return $this->frontmatter;
+        }
+
         if ($scope == 'header') {
             $current = $this->header();
             foreach ($path as $field) {