diff --git a/components/Editor/Editor.vue b/components/Editor/Editor.vue
index 9e25e1daa..2a68da45a 100644
--- a/components/Editor/Editor.vue
+++ b/components/Editor/Editor.vue
@@ -71,19 +71,19 @@
         <ds-button
           class="menubar__button"
           size="small"
-          :ghost="!isActive.heading({ level: 2 })"
-          @click.prevent="commands.heading({ level: 2 })"
+          :ghost="!isActive.heading({ level: 3 })"
+          @click.prevent="commands.heading({ level: 3 })"
         >
-          H2
+          H3
         </ds-button>
 
         <ds-button
           class="menubar__button"
           size="small"
-          :ghost="!isActive.heading({ level: 3 })"
-          @click.prevent="commands.heading({ level: 3 })"
+          :ghost="!isActive.heading({ level: 4 })"
+          @click.prevent="commands.heading({ level: 4 })"
         >
-          H3
+          H4
         </ds-button>
 
         <ds-button
@@ -184,7 +184,7 @@ export default {
           new Strike(),
           new Underline(),
           new Link(),
-          new Heading({ levels: [2, 3] }),
+          new Heading({ levels: [3, 4] }),
           new ListItem(),
           new Placeholder({
             emptyNodeClass: 'is-empty',
diff --git a/components/Editor/plugins/eventHandler.js b/components/Editor/plugins/eventHandler.js
index b3e41ace5..6086421b8 100644
--- a/components/Editor/plugins/eventHandler.js
+++ b/components/Editor/plugins/eventHandler.js
@@ -23,7 +23,7 @@ export default class EventHandler extends Extension {
                 ''
               )
               .replace(/[\n]{3,}/gim, '\n\n')
-              .replace(/(\r\n|\n\r|\r|\n)/g, '<br>')
+              .replace(/(\r\n|\n\r|\r|\n)/g, '<br>$1')
 
               // replace all p tags with line breaks (and spaces) only by single linebreaks
               // limit linebreaks to max 2 (equivalent to html "br" linebreak)
diff --git a/pages/post/_slug/edit/_id.vue b/pages/post/_slug/edit/_id.vue
index c39423f11..2366ab65f 100644
--- a/pages/post/_slug/edit/_id.vue
+++ b/pages/post/_slug/edit/_id.vue
@@ -3,7 +3,7 @@
     :width="{ base: '100%' }"
     gutter="base"
   >
-    <ds-flex-item :width="{ base: '100%', sm: 3, md: 5, lg: 3 }">
+    <ds-flex-item :width="{ base: '100%' }">
       <ds-card>
         <no-ssr>
           <hc-editor v-model="content" />
@@ -14,6 +14,8 @@
         >
           <ds-button
             icon="check"
+            :loading="loading"
+            :disabled="disabled"
             primary
             @click="save"
           >
@@ -38,25 +40,59 @@ export default {
   },
   data() {
     return {
-      content: ''
+      content: '',
+      loading: false,
+      disabled: false,
+      slug: null
     }
   },
   watch: {
     Post: {
       immediate: true,
       handler: function(post) {
-        console.log('try to set content', this.content, post)
         if (!post || !post[0].content) {
           return
         }
-        console.log(post[0].content)
+        this.slug = post[0].slug
         this.content = post[0].content
       }
     }
   },
   methods: {
     save() {
-      console.log(this.content)
+      this.loading = true
+      this.$apollo
+        .mutate({
+          mutation: gql`
+            mutation($id: ID!, $content: String!) {
+              UpdatePost(id: $id, content: $content) {
+                id
+                slug
+                content
+                contentExcerpt
+              }
+            }
+          `,
+          variables: {
+            id: 'p1',
+            content: this.content
+          }
+        })
+        .then(data => {
+          this.loading = false
+          this.$toast.success('Saved!')
+          this.disabled = true
+
+          this.$router.push({
+            name: 'post-slug',
+            params: { slug: this.slug }
+          })
+        })
+        .catch(err => {
+          this.$toast.error(err.message)
+          this.loading = false
+          this.disabled = false
+        })
     }
     //onUpdate(data) {
     //  console.log('onUpdate', data)