diff --git a/components/molecules/FilesTree.vue b/components/molecules/FilesTree.vue
index 591916bd4..cddac937a 100644
--- a/components/molecules/FilesTree.vue
+++ b/components/molecules/FilesTree.vue
@@ -4,7 +4,7 @@
       <div
         class="group border-r-2 py-2 pr-6 flex items-center text-sm font-medium focus:u-bg-gray-50 focus:outline-none w-full cursor-pointer"
         :class="{
-          [`pl-${6 + (level * 3)}`]: true,
+          [`pl-[${24 + (level * 12)}px]`]: true,
           'u-bg-gray-100 u-border-gray-800 u-text-gray-900': isSelected(file),
           'border-transparent u-text-gray-500 hover:u-text-gray-900 hover:u-bg-gray-50': !isSelected(file)
         }"
diff --git a/composables/useMarkdown.ts b/composables/useMarkdown.ts
new file mode 100644
index 000000000..6dd0b0feb
--- /dev/null
+++ b/composables/useMarkdown.ts
@@ -0,0 +1,37 @@
+import * as matter from 'gray-matter'
+import flat from 'flat'
+
+export const useMarkdown = () => {
+  function parseFrontMatter (content) {
+    // @ts-ignore
+    const { data, content: c, ...rest } = matter.default ? matter.default(content) : matter(content)
+
+    // unflatten frontmatter data
+    // convert `parent.child` keys into `parent: { child: ... }`
+    const unflattenData = flat.unflatten(data || {}, {})
+
+    return {
+      content: c.replace(/^\n/, ''),
+      matter: unflattenData,
+      ...rest
+    }
+  }
+
+  function stringifyFrontMatter (content, data = {}) {
+  // flatten frontmatter data
+  // convert `parent: { child: ... }` into flat keys `parent.child`
+    data = flat.flatten(data, {
+    // preserve arrays and their contents as is and do not waltk through arrays
+    // flatten array will be like `parent.0.child` and `parent.1.child` with is not readable
+      safe: true
+    })
+
+    // eslint-disable-next-line import/no-named-as-default-member
+    return matter.stringify(`\n${content}`, data)
+  }
+
+  return {
+    parseFrontMatter,
+    stringifyFrontMatter
+  }
+}
diff --git a/nuxt.config.ts b/nuxt.config.ts
index c688efe3e..cb765b8bb 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -72,7 +72,7 @@ export default defineNuxtConfig({
         require('@tailwindcss/typography')
       ],
       content: ['presets/*.ts'],
-      safelist: [3, 6, 9, 12, 15, 18, 21, 24, 27, 30].map(number => `pl-${number}`)
+      safelist: [24, 36, 48, 60, 72, 84, 96, 108, 120].map(number => `pl-[${number}px]`)
     }
   }
 })
diff --git a/pages/@[team]/[project]/content.vue b/pages/@[team]/[project]/content.vue
index c51ec8629..5a76e4e09 100644
--- a/pages/@[team]/[project]/content.vue
+++ b/pages/@[team]/[project]/content.vue
@@ -14,7 +14,7 @@
       />
     </template>
 
-    <DocusEditor v-model="content" />
+    <DocusEditor :model-value="parsedContent" @update:model-value="saveContent" />
   </ProjectPage>
 </template>
 
@@ -34,12 +34,16 @@ const props = defineProps({
 })
 
 const client = useStrapiClient()
+const { parseFrontMatter, stringifyFrontMatter } = useMarkdown()
 
 const branch: Ref<Branch> = ref(null)
 const file: Ref<File> = ref(null)
 const content: Ref<string> = ref('')
+const updatedContent: Ref<string> = ref('')
+const parsedContent: Ref<string> = ref('')
+const parsedMatter: Ref<string> = ref('')
 
-const { data: branches, refresh: refreshBranches } = await useAsyncData('files', () => client<Branch[]>(`/projects/${props.project.id}/branches`))
+const { data: branches, refresh: refreshBranches } = await useAsyncData('branches', () => client<Branch[]>(`/projects/${props.project.id}/branches`))
 
 const { data: files, refresh: refreshFiles } = await useAsyncData('files', () => client<File[]>(`/projects/${props.project.id}/files`, {
   params: {
@@ -56,9 +60,7 @@ watch(files, () => {
 
 // Select branch when branches changes
 watch(branches, () => {
-  const branchName = localStorage.getItem(`projects-${props.project.id}-branch`)
-
-  selectBranch((branchName && branches.value.find(branch => branch.name === branchName)) || branches.value.find(branch => branch.name === props.project.repository.default_branch) || branches.value[0])
+  selectBranch(branches.value.find(branch => branch.name === props.project.repository.default_branch) || branches.value[0])
 }, { immediate: true })
 
 // Fetch content when file changes
@@ -75,6 +77,18 @@ watch(file, async () => {
 // Fetch files when branch changes
 watch(branch, async () => await refreshFiles())
 
+// Split markdown front-matter when content changes
+watch(content, () => {
+  const { content: c, matter } = parseFrontMatter(content.value)
+
+  parsedContent.value = c
+  parsedMatter.value = matter
+}, { immediate: true })
+
+function saveContent (content) {
+  updatedContent.value = stringifyFrontMatter(content, parsedMatter.value)
+}
+
 function findFileFromPath (path, files) {
   for (const file of files) {
     if (file.path === path) {
@@ -93,6 +107,5 @@ function selectFile (f: File) {
 
 function selectBranch (b: Branch) {
   branch.value = b
-  localStorage.setItem(`projects-${props.project.id}-branch`, branch.value?.name)
 }
 </script>
diff --git a/plugins/fix-gray-matter.client.ts b/plugins/fix-gray-matter.client.ts
new file mode 100644
index 000000000..3e8ff3063
--- /dev/null
+++ b/plugins/fix-gray-matter.client.ts
@@ -0,0 +1,8 @@
+import { Buffer } from 'buffer'
+import { defineNuxtPlugin } from '#imports'
+
+// TODO: remove this fix when https://github.com/jonschlinkert/gray-matter/pull/132 is merged
+// `Buffer` is not globally available
+export default defineNuxtPlugin(() => {
+  Object.assign(window, { Buffer })
+})