diff --git a/components/ContentMenu.vue b/components/ContentMenu.vue
index a6940b19f..5e614c476 100644
--- a/components/ContentMenu.vue
+++ b/components/ContentMenu.vue
@@ -68,19 +68,14 @@ export default {
       let routes = []
 
       if (this.isOwner && this.context === 'contribution') {
-        // const link = this.$router.resolve({
-        //   name: 'post-edit-id',
-        //   params: {
-        //     id: this.itemId
-        //   }
-        // }).href
         routes.push({
           name: this.$t(`contribution.edit`),
-          callback: () => {
-            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-            return this.$router.push(`/post/edit/${this.itemId}`)
-            // return this.$router.push(link)
-          },
+          path: this.$router.resolve({
+            name: 'post-edit-id',
+            params: {
+              id: this.itemId
+            }
+          }).href,
           icon: 'edit'
         })
       }
diff --git a/pages/index.vue b/pages/index.vue
index 1cc28e857..7bc85b3a4 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -16,11 +16,11 @@
     <no-ssr>
       <ds-button
         v-tooltip="{content: 'Create a new Post', placement: 'left', delay: { show: 500 }}"
+        :path="{ name: 'post-create' }"
         class="post-add-button"
         icon="plus"
         size="x-large"
         primary
-        @click="$router.push('/post/create')"
       />
     </no-ssr>
     <hc-load-more
diff --git a/pages/post/create.vue b/pages/post/create.vue
index 602ed4f88..72cf65174 100644
--- a/pages/post/create.vue
+++ b/pages/post/create.vue
@@ -3,10 +3,10 @@
     :width="{ base: '100%' }"
     gutter="base"
   >
-    <ds-flex-item :width="{ base: '100%' }">
+    <ds-flex-item :width="{ base: '100%', md: 3 }">
       <hc-contribution-form />
     </ds-flex-item>
-    <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">
+    <ds-flex-item :width="{ base: '100%', md: 1 }">
       &nbsp;
     </ds-flex-item>
   </ds-flex>
diff --git a/pages/post/_slug/edit/_id.vue b/pages/post/edit/_id.vue
similarity index 92%
rename from pages/post/_slug/edit/_id.vue
rename to pages/post/edit/_id.vue
index f210e210d..156bcfd23 100644
--- a/pages/post/_slug/edit/_id.vue
+++ b/pages/post/edit/_id.vue
@@ -3,10 +3,10 @@
     :width="{ base: '100%' }"
     gutter="base"
   >
-    <ds-flex-item :width="{ base: '100%' }">
+    <ds-flex-item :width="{ base: '100%', md: 3 }">
       <hc-contribution-form :contribution="contribution" />
     </ds-flex-item>
-    <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">
+    <ds-flex-item :width="{ base: '100%', md: 1 }">
       &nbsp;
     </ds-flex-item>
   </ds-flex>
diff --git a/pages/profile/_slug.vue b/pages/profile/_slug.vue
index 1637747d9..98d3b9f48 100644
--- a/pages/profile/_slug.vue
+++ b/pages/profile/_slug.vue
@@ -256,11 +256,11 @@
             <ds-button
               v-if="myProfile"
               v-tooltip="{content: 'Create a new Post', placement: 'left', delay: { show: 500 }}"
+              :path="{ name: 'post-create' }"
               class="profile-post-add-button"
               icon="plus"
               size="large"
               primary
-              @click="$router.push('/post/create')"
             />
           </ds-flex-item>
           <template v-if="activePosts.length">