diff --git a/components/FollowButton.vue b/components/FollowButton.vue
new file mode 100644
index 000000000..012def236
--- /dev/null
+++ b/components/FollowButton.vue
@@ -0,0 +1,52 @@
+<template>
+  <ds-button
+    :disabled="disabled"
+    icon="plus"
+    primary
+    full-width
+    @click.prevent="follow">Folgen</ds-button>
+</template>
+
+<script>
+import gql from 'graphql-tag'
+
+export default {
+  name: 'HcFollowButton',
+
+  props: {
+    followId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      disabled: false
+    }
+  },
+  methods: {
+    follow() {
+      this.$apollo
+        .mutate({
+          mutation: gql`
+            mutation($myId: ID!, $followId: ID!) {
+              AddUserFollowing(from: { id: $myId }, to: { id: $followId }) {
+                from {
+                  id
+                }
+              }
+            }
+          `,
+          variables: {
+            myId: 'u1',
+            followId: this.followId
+          }
+        })
+        .then(() => {
+          this.disabled = true
+          this.$emit('update')
+        })
+    }
+  }
+}
+</script>
diff --git a/components/PostCard.vue b/components/PostCard.vue
new file mode 100644
index 000000000..4d2c10b9d
--- /dev/null
+++ b/components/PostCard.vue
@@ -0,0 +1,53 @@
+<template>
+  <a
+    v-router-link
+    :href="href(post)"
+  >
+    <ds-card
+      :header="post.title"
+      :image="post.image"
+      style="cursor: pointer; position: relative;">
+      <div v-html="post.contentExcerpt" />
+      <ds-space />
+      <ds-space
+        margin="small"
+        style="position: absolute; bottom: 44px;">
+        <ds-avatar
+          :image="post.author.User.avatar"
+          size="32px" /> <b class="username">{{ post.author.User.name }}</b>
+      </ds-space>
+      <template slot="footer">
+        <span>
+          <ds-icon name="comments" /> <small v-if="post.commentsCount">{{ post.commentsCount }}</small>
+        </span>
+        &nbsp;
+        <span>
+          <ds-icon name="heart-o" /> <small v-if="post.shoutedCount">{{ post.shoutedCount }}</small>
+        </span>
+      </template>
+    </ds-card>
+  </a>
+</template>
+
+<script>
+/**
+ * TODO: we have to check if the user is already following
+ */
+export default {
+  name: 'HcPostCard',
+  props: {
+    post: {
+      type: Object,
+      required: true
+    }
+  },
+  methods: {
+    href(post) {
+      return this.$router.resolve({
+        name: 'post-slug',
+        params: { slug: post.slug }
+      }).href
+    }
+  }
+}
+</script>
diff --git a/graphql/UserProfileQuery.js b/graphql/UserProfileQuery.js
new file mode 100644
index 000000000..d2c37844e
--- /dev/null
+++ b/graphql/UserProfileQuery.js
@@ -0,0 +1,39 @@
+import gql from 'graphql-tag'
+
+export default gql(`
+  query User($slug: String!) {
+    User(slug: $slug) {
+      id
+      name
+      avatar
+      friendsCount
+      friends {
+        id
+        name
+        slug
+        avatar
+      }
+      badgesCount
+      followingCount
+      followedByCount
+      contributionsCount
+      contributions {
+        Post {
+          id
+          slug
+          title
+          contentExcerpt
+          shoutedCount
+          commentsCount
+          image
+          author {
+            User {
+              avatar
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+`)
diff --git a/pages/index.vue b/pages/index.vue
index 87236ce16..97acc7d8c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -8,30 +8,7 @@
           v-for="post in Post"
           :width="{ base: '100%', xs: '100%', md: '50%', xl: '33%' }"
           :key="post.id">
-          <a
-            v-router-link
-            :href="href(post)"
-          >
-            <ds-card
-              :header="post.title"
-              :image="post.image"
-              style="cursor: pointer">
-              <ds-avatar
-                :image="post.author.User.avatar"
-                size="32px" /> <b class="username">{{ post.author.User.name }}</b>
-              <ds-space />
-              <div v-html="post.contentExcerpt" />
-              <template slot="footer">
-                <span>
-                  <ds-icon name="comments" /> <small v-if="post.commentsCount">{{ post.commentsCount }}</small>
-                </span>
-                &nbsp;
-                <span>
-                  <ds-icon name="heart-o" /> <small v-if="post.shoutedCount">{{ post.shoutedCount }}</small>
-                </span>
-              </template>
-            </ds-card>
-          </a>
+          <hc-post-card :post="post" />
         </ds-flex-item>
       </ds-flex>
     </no-ssr>
@@ -40,8 +17,12 @@
 
 <script>
 import gql from 'graphql-tag'
+import HcPostCard from '~/components/PostCard.vue'
 
 export default {
+  components: {
+    HcPostCard
+  },
   data() {
     return {
       // Initialize your apollo data
diff --git a/pages/post/_slug/index.vue b/pages/post/_slug/index.vue
index ff7642176..f684930ee 100644
--- a/pages/post/_slug/index.vue
+++ b/pages/post/_slug/index.vue
@@ -178,8 +178,6 @@ export default {
   }
   .ds-card-footer {
     padding: 0;
-    border-radius: 0 0 $border-radius-large $border-radius-large;
-    overflow: hidden;
 
     .ds-section {
       padding: $space-base;
diff --git a/pages/profile/_slug.vue b/pages/profile/_slug.vue
index f2c9908be..4ddd7d649 100644
--- a/pages/profile/_slug.vue
+++ b/pages/profile/_slug.vue
@@ -9,7 +9,7 @@
         v-if="user"
         :width="{ base: '100%' }"
         gutter="base">
-        <ds-flex-item :width="{ base: '30%' }">
+        <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">
           <ds-card style="position: relative; height: auto;">
             <ds-avatar
               :image="user.avatar"
@@ -17,7 +17,7 @@
               size="120px" />
             <h3 style="text-align: center;">{{ user.name }}</h3>
             <ds-space/>
-            <ds-flex :size="{ base: '100%' }">
+            <ds-flex>
               <ds-flex-item style="text-align: center;">
                 <ds-text
                   size="x-large"
@@ -31,7 +31,12 @@
                 <ds-text size="small">Freunde</ds-text>
               </ds-flex-item>
             </ds-flex>
-            <ds-space margin-bottom="small"/>
+            <ds-space
+              margin="small">
+              <hc-follow-button
+                :follow-id="user.id"
+                @update="fetchUser" />
+            </ds-space>
           </ds-card>
           <ds-space/>
           <h2 style="text-align: center; margin-bottom: 10px;">Netzwerk</h2>
@@ -40,8 +45,7 @@
               <ds-space
                 v-for="friend in user.friends"
                 :key="friend.id"
-                margin-top="x-small"
-                margin-bottom="x-small">
+                margin="x-small">
                 <a
                   v-router-link
                   :href="$router.resolve({ name: 'profile-slug', params: { slug: friend.slug } }).href">
@@ -56,46 +60,33 @@
             </template>
           </ds-card>
         </ds-flex-item>
-        <ds-flex-item :width="{ base: '70%' }">
+        <ds-flex-item :width="{ base: '100%', sm: 3, md: 5, lg: 3 }">
           <ds-flex
             :width="{ base: '100%' }"
             gutter="small">
             <ds-flex-item
-              v-for="item in user.contributions"
+              v-for="{ Post } in user.contributions"
               :width="{ base: '100%', md: '100%', xl: '50%' }"
-              :key="item.Post.id">
-              <a
-                v-router-link
-                :href="href(item.Post)"
-              >
-                <ds-card
-                  :header="item.Post.title"
-                  :image="item.Post.image"
-                  style="cursor: pointer">
-                  <div v-html="item.Post.contentExcerpt" />
-                  <template slot="footer">
-                    <span>
-                      <ds-icon name="comments" /> <small v-if="item.Post.commentsCount">{{ item.Post.commentsCount }}</small>
-                    </span>
-                    &nbsp;
-                    <span>
-                      <ds-icon name="heart-o" /> <small v-if="item.Post.shoutedCount">{{ item.Post.shoutedCount }}</small>
-                    </span>
-                  </template>
-                </ds-card>
-              </a>
+              :key="Post.id">
+              <hc-post-card :post="Post" />
             </ds-flex-item>
           </ds-flex>
         </ds-flex-item>
       </ds-flex>
     </no-ssr>
   </div>
+
 </template>
 
 <script>
-import gql from 'graphql-tag'
+import HcPostCard from '~/components/PostCard.vue'
+import HcFollowButton from '~/components/FollowButton.vue'
 
 export default {
+  components: {
+    HcPostCard,
+    HcFollowButton
+  },
   transition: {
     name: 'slide-up',
     mode: 'out-in'
@@ -112,46 +103,14 @@ export default {
     }
   },
   methods: {
-    href(post) {
-      return this.$router.resolve({
-        name: 'post-slug',
-        params: { slug: post.slug }
-      }).href
+    fetchUser() {
+      // TODO: we should use subscriptions instead of fetching the whole user again
+      this.$apollo.queries.User.refetch()
     }
   },
   apollo: {
     User: {
-      query: gql(`
-        query User($slug: String!) {
-          User(slug: $slug) {
-            id
-            name
-            avatar
-            friendsCount
-            friends {
-              id
-              name
-              slug
-              avatar
-            }
-            badgesCount
-            followingCount
-            followedByCount
-            contributionsCount
-            contributions {
-              Post {
-                id
-                slug
-                title
-                contentExcerpt
-                shoutedCount
-                commentsCount
-                image
-              }
-            }
-          }
-        }
-      `),
+      query: require('~/graphql/UserProfileQuery.js').default,
       variables() {
         return {
           slug: this.$route.params.slug