diff --git a/src/admin/app/App.vue b/src/admin/app/App.vue
index fa90f7eb2..b0624b57b 100644
--- a/src/admin/app/App.vue
+++ b/src/admin/app/App.vue
@@ -9,36 +9,19 @@
       </KeepAlive>
     </RouterView>
 
-    <iframe ref="iframe" :src="previewUrl" class="h-full flex-1" />
+    <Preview />
   </main>
 </template>
 
 <script lang="ts">
-import { defineComponent, provide, ref, onBeforeMount } from 'vue3'
+import { defineComponent } from 'vue3'
 import AppHeader from './components/AppHeader.vue'
-import { useApi } from './plugins/api'
+import Preview from './components/Preview.vue'
 
 export default defineComponent({
   components: {
-    AppHeader
-  },
-
-  setup() {
-    const api = useApi()
-
-    const previewUrl = ref('http://localhost:4000')
-
-    onBeforeMount(async () => {
-      const { url } = (await api.get('/preview')) as any
-
-      previewUrl.value = url
-    })
-
-    provide('previewUrl', previewUrl)
-
-    return {
-      previewUrl
-    }
+    AppHeader,
+    Preview
   }
 })
 </script>
diff --git a/src/admin/app/components/Editor.vue b/src/admin/app/components/Editor.vue
index 14afb85f7..785077c23 100644
--- a/src/admin/app/components/Editor.vue
+++ b/src/admin/app/components/Editor.vue
@@ -1,9 +1,13 @@
 <template>
-  <textarea v-model="frontmatter" class="h-24 w-full" />
-  <textarea v-model="content" class="w-full h-full" />
+  <textarea
+    v-model="frontmatter"
+    class="h-24 w-full font-mono px-4 py-2 d-border-primary border-b outline-none text-sm"
+  />
+  <textarea v-model="content" class="w-full h-full font-mono px-4 py-2 outline-none text-sm" />
 </template>
 
 <script lang="ts">
+import YAML from 'js-yaml'
 import { GrayMatterFile } from 'gray-matter'
 import { defineComponent, computed, ref, watch, PropType } from 'vue3'
 import { useApi } from '../plugins/api'
@@ -36,14 +40,14 @@ export default defineComponent({
     // Stringified reference for frontmatter text-area
     const frontmatter = computed({
       get() {
-        return JSON.stringify(data.value, null, 2)
+        return YAML.dump(data.value, null, 2)
       },
       set(value: string) {
         try {
-          data.value = JSON.parse(value)
+          data.value = YAML.parse(value)
         } catch (e) {
-          // New value is not a valid JSON string.
-          // Do nothing and wait for the next valid JSON input.
+          // New value is not a valid YAML string.
+          // Do nothing and wait for the next valid YAML input.
         }
       }
     })
diff --git a/src/admin/app/components/FilesTreeIcon.vue b/src/admin/app/components/FilesTreeIcon.vue
index 5d717ab04..501fddc6d 100644
--- a/src/admin/app/components/FilesTreeIcon.vue
+++ b/src/admin/app/components/FilesTreeIcon.vue
@@ -21,7 +21,7 @@
     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
   </svg>
 
-  <span v-else-if="!isRoot || hasOneDir(files)" class="mr-1 inline-block h-4 w-4" />
+  <span v-else class="mr-1 inline-block h-4 w-4" />
 
   <svg
     v-if="isDir(file)"
diff --git a/src/admin/app/components/Preview.vue b/src/admin/app/components/Preview.vue
new file mode 100644
index 000000000..ff7378bfb
--- /dev/null
+++ b/src/admin/app/components/Preview.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { onBeforeMount, ref, watch } from 'vue3'
+import { fetchPreviewOrigin, previewUrl, previewPath } from '../composables/preview'
+
+const iframe = ref<HTMLIFrameElement>()
+
+onBeforeMount(() => fetchPreviewOrigin())
+
+watch(
+  [previewUrl, iframe],
+  () => {
+    if (!iframe.value) return
+    try {
+      iframe.value.contentWindow.$nuxt.$router.push(previewPath.value)
+    } catch (e) {
+      // fallback to hard refresh when working with cross-origin
+      iframe.value.src = previewUrl.value
+    }
+  },
+  { flush: 'post' }
+)
+
+function refresh() {
+  iframe.value.src += ''
+}
+</script>
+
+<template>
+  <div class="h-full flex-1 grid grid-rows-[min-content,1fr]">
+    <div class="p-2 flex d-border-primary border-b">
+      <div class="flex-auto my-auto px-2">{{ previewUrl }}</div>
+      <button class="border d-border-primary rounded px-2 py-1" @click="refresh">Refresh</button>
+    </div>
+    <iframe ref="iframe" :src="previewOrigin" class="w-full h-full" />
+  </div>
+</template>
diff --git a/src/admin/app/composables/index.ts b/src/admin/app/composables/index.ts
new file mode 100644
index 000000000..2d3d80bf1
--- /dev/null
+++ b/src/admin/app/composables/index.ts
@@ -0,0 +1 @@
+export * from './preview'
diff --git a/src/admin/app/composables/preview.ts b/src/admin/app/composables/preview.ts
new file mode 100644
index 000000000..b4e622c57
--- /dev/null
+++ b/src/admin/app/composables/preview.ts
@@ -0,0 +1,21 @@
+import { ref, computed } from 'vue3'
+import { useApi } from '../plugins/api'
+
+export const previewOrigin = ref('http://localhost:4000')
+export const previewPath = ref('/')
+export const previewUrl = computed(() => previewOrigin.value + previewPath.value)
+
+const api = useApi()
+
+export async function fetchPreviewOrigin() {
+  const { url } = (await api.get('/preview')) as any
+
+  previewOrigin.value = url
+}
+
+export function navigateToFile(filepath: string) {
+  previewPath.value = filepath
+    .replace(/\/\d+\./g, '/')
+    .replace(/\.md$/, '')
+    .replace(/\/index$/, '/')
+}
diff --git a/src/admin/app/pages/index.vue b/src/admin/app/pages/index.vue
index bc69796f6..d68ff2dac 100644
--- a/src/admin/app/pages/index.vue
+++ b/src/admin/app/pages/index.vue
@@ -16,6 +16,7 @@ import { reactive, defineComponent, onMounted, toRefs } from 'vue3'
 import FilesTree from '../components/FilesTree.vue'
 import Editor from '../components/Editor.vue'
 import { useApi } from '../plugins/api'
+import { navigateToFile } from '../composables/preview'
 
 export default defineComponent({
   components: {
@@ -30,7 +31,10 @@ export default defineComponent({
       currentFile: null
     })
 
-    const openFile = async file => (state.currentFile = await api.get(`/pages${file.path}`))
+    const openFile = async file => {
+      navigateToFile(file.path)
+      state.currentFile = await api.get(`/pages${file.path}`)
+    }
 
     onMounted(async () => (state.files = await api.get('/pages')))
 
diff --git a/src/admin/app/pages/static.vue b/src/admin/app/pages/static.vue
index 23e83b118..91b2a6bb2 100644
--- a/src/admin/app/pages/static.vue
+++ b/src/admin/app/pages/static.vue
@@ -27,42 +27,27 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue3'
 import FilesTree from '../components/FilesTree.vue'
 import Editor from '../components/Editor.vue'
+import { useApi } from '../plugins/api'
 import { isImage } from '../utils'
+import { previewUrl } from '../composables/preview'
 
-export default {
-  components: {
-    FilesTree,
-    Editor
-  },
+const api = useApi()
+const files = ref([])
+const currentFile = ref(null)
 
-  inject: ['previewUrl'],
+onMounted(async () => {
+  files.value = await api.get('/static')
+})
 
-  setup() {
-    return { isImage }
-  },
-
-  data() {
-    return {
-      files: [],
-      currentFile: null
-    }
-  },
-
-  async mounted() {
-    this.files = await this.$api.get('/static')
-  },
-
-  methods: {
-    async openFile(file) {
-      if (this.isImage(file)) {
-        this.currentFile = file
-      } else {
-        this.currentFile = await this.$api.get(`/static${file.path}`)
-      }
-    }
+async function openFile(file) {
+  if (isImage(file)) {
+    currentFile.value = file
+  } else {
+    currentFile.value = await api.get(`/static${file.path}`)
   }
 }
 </script>