diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 708f2b2bf..1a9c8b168 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -65,12 +65,13 @@
                   name="eventStart"
                   v-model="formData.eventStart"
                   type="datetime"
-                  :hour-options="hours"
                   value-type="format"
+                  :minute-step="15"
                   formmat="DD-MM-YYYY HH:mm"
                   style="z-index: 20"
                   :placeholder="$t('post.viewEvent.eventStart')"
                   :disabled-date="notBeforeToday"
+                  :show-second="false"
                 ></date-picker>
               </div>
               <div class="chipbox" style="margin-top: 10px">
@@ -86,11 +87,12 @@
                 v-model="formData.eventEnd"
                 type="datetime"
                 :minute-step="15"
-                :hour-options="hours"
+                :seconds-step="0"
                 formmat="DD MM YYYY HH:mm"
                 :placeholder="$t('post.viewEvent.eventEnd')"
                 style="font-size: larger"
                 :disabled-date="notBeforeToday"
+                :show-second="false"
               ></date-picker>
             </ds-grid-item>
           </ds-grid>
@@ -232,7 +234,6 @@ export default {
     return {
       categoriesActive: this.$env.CATEGORIES_ACTIVE,
       links,
-      hours: Array.from({ length: 10 }).map((_, i) => i + 8),
       formData: {
         title: title || '',
         content: content || '',
@@ -262,7 +263,7 @@ export default {
             return []
           },
         },
-        eventStart: { required: !!this.creatEvent },
+        eventStart: { required: !this.creatEvent },
         eventVenue: { required: !!this.creatEvent, min: 3, max: 100 },
         eventLocationName: { required: !!this.creatEvent, min: 3, max: 100 },
       },
@@ -279,9 +280,6 @@ export default {
     ...mapGetters({
       currentUser: 'auth/user',
     }),
-    notBeforeToday(date) {
-      return date < new Date(new Date().setHours(0, 0, 0, 0));
-    },
     eventInput() {
       if (this.creatEvent) {
         return {
@@ -311,6 +309,9 @@ export default {
     },
   },
   methods: {
+    notBeforeToday(date) {
+      return date < new Date(new Date().setHours(0, 0, 0, 0))
+    },
     submit() {
       let image = null
 
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 202f4b702..0d8c30f55 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -57,7 +57,11 @@
             <ds-space margin-bottom="small" />
             <content-viewer class="content hyphenate-text" :content="post.content" />
             <!-- Eventdata -->
-            <ds-space v-if="post && post.postType[0] === 'Event'" margin-bottom="small" style="padding: 10px; border-top: solid #f5f4f6 3px;">
+            <ds-space
+              v-if="post && post.postType[0] === 'Event'"
+              margin-bottom="small"
+              style="padding: 10px; border-top: solid #f5f4f6 3px"
+            >
               <ds-flex>
                 <ds-flex-item width="200px">{{ $t('post.viewEvent.eventStart') }}:</ds-flex-item>
                 <ds-flex-item>{{ post.eventStart }}</ds-flex-item>
@@ -74,7 +78,9 @@
               </ds-flex>
               <ds-space margin-bottom="x-small" />
               <ds-flex>
-                <ds-flex-item width="200px">{{ $t('post.viewEvent.eventLocationName') }}:</ds-flex-item>
+                <ds-flex-item width="200px">
+                  {{ $t('post.viewEvent.eventLocationName') }}:
+                </ds-flex-item>
                 <ds-flex-item>{{ post.eventLocationName }}</ds-flex-item>
               </ds-flex>
               <ds-space margin-bottom="x-small" />
diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue
index e546b70f5..c282af776 100644
--- a/webapp/pages/post/create.vue
+++ b/webapp/pages/post/create.vue
@@ -1,42 +1,53 @@
 <template>
   <div>
-    <ds-space margin="small">
-      <ds-flex :width="{ base: '100%' }" gutter="base">
-        <ds-flex-item :width="{ base: '100%', md: 5 }">
-          <ds-flex gutter="base" :width="{ base: '100%', sm: 1 }">
-            <ds-flex-item>
-              <ds-card header="" :primary="!creatEvent" centered>
-                <template slot="footer">
-                  <ds-heading v-if="!creatEvent" tag="h2">
-                    {{ $t('post.createNewPost.title') }}
-                  </ds-heading>
-                  <ds-button v-if="!!creatEvent" @click="creatEvent = !creatEvent">
-                    {{ $t('post.createNewPost.title') }}
-                  </ds-button>
-                </template>
-              </ds-card>
-            </ds-flex-item>
-            <ds-flex-item>
-              <ds-card header="" :primary="!!creatEvent" centered>
-                <template slot="footer">
-                  <ds-heading v-if="creatEvent" tag="h2">
-                    {{ $t('post.createNewEvent.title') }}
-                  </ds-heading>
-                  <ds-button v-if="!creatEvent" @click="creatEvent = !creatEvent">
-                    {{ $t('post.createNewEvent.title') }}
-                  </ds-button>
-                </template>
-              </ds-card>
-            </ds-flex-item>
-          </ds-flex>
-          <div v-if="group" style="font-size: 30px; text-align: center">
-            {{ $t('post.createNewPost.forGroup.title', { name: group.name }) }}
-          </div>
-        </ds-flex-item>
-        <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
-      </ds-flex>
-    </ds-space>
-    <ds-space margin="small" />
+    <ds-flex :width="{ base: '100%' }">
+      <ds-flex-item :width="{ base: '100%', md: 5 }">
+        <ds-flex gutter="base" :width="{ base: '100%', sm: 1 }">
+          <ds-flex-item>
+            <ds-card :primary="!creatEvent" centered>
+              <div>
+                <ds-button
+                  v-if="!creatEvent"
+                  ghost
+                  fullwidth
+                  size="x-large"
+                  style="background-color: #ff000000; color: whitesmoke"
+                >
+                  {{ $t('post.createNewPost.title') }}
+                </ds-button>
+                <ds-button v-else ghost fullwidth size="x-large" @click="creatEvent = !creatEvent">
+                  {{ $t('post.createNewPost.title') }}
+                </ds-button>
+              </div>
+            </ds-card>
+          </ds-flex-item>
+          <ds-flex-item>
+            <ds-card :primary="!!creatEvent" centered>
+              <div>
+                <ds-button
+                  ghost
+                  fullwidth
+                  size="x-large"
+                  v-if="creatEvent"
+                  hover="false"
+                  style="background-color: #ff000000; color: whitesmoke"
+                >
+                  {{ $t('post.createNewEvent.title') }}
+                </ds-button>
+                <ds-button ghost fullwidth size="x-large" v-else @click="creatEvent = !creatEvent">
+                  {{ $t('post.createNewEvent.title') }}
+                </ds-button>
+              </div>
+            </ds-card>
+          </ds-flex-item>
+        </ds-flex>
+        <div v-if="group" style="font-size: 30px; text-align: center">
+          {{ $t('post.createNewPost.forGroup.title', { name: group.name }) }}
+        </div>
+      </ds-flex-item>
+      <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
+    </ds-flex>
+
     <ds-flex :width="{ base: '100%' }" gutter="base">
       <ds-flex-item :width="{ base: '100%', md: 5 }">
         <contribution-form :group="group" :creatEvent="creatEvent" />