diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index a7bdbe68b..85ea9c829 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="postCard" class="grid-item" v-bind:style="{ gridRowEnd: 'span ' + rowSpan }">
+  <ds-grid-item ref="postCard" v-bind:style="{ gridRowEnd: 'span ' + rowSpan }">
     <ds-card
       :image="post.image | proxyApiUrl"
       :class="{ 'post-card': true, 'disabled-content': post.disabled }"
@@ -67,7 +67,7 @@
         </no-ssr>
       </template>
     </ds-card>
-  </div>
+  </ds-grid-item>
 </template>
 
 <script>
@@ -144,7 +144,7 @@ export default {
     },
   },
   mounted() {
-    const image = this.$refs.postCard.querySelector('img')
+    const image = this.$refs.postCard.$el.querySelector('img')
     if (image) {
       image.onload = this.calculateItemHeight
     } else {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 868b01836..87ba701b0 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <div class="masonry-grid">
-      <div class="grid-item grid-item--full-width">
+    <ds-grid>
+      <ds-grid-item :row-span="2" column-span="fullWidth">
         <filter-menu :hashtag="hashtag" @clearSearch="clearSearch" />
-      </div>
-      <div class="grid-item grid-item--full-width">
+      </ds-grid-item>
+      <ds-grid-item :row-span="2" column-span="fullWidth">
         <div class="sorting-dropdown">
           <ds-select
             v-model="selected"
@@ -14,7 +14,7 @@
             @input="toggleOnlySorting"
           ></ds-select>
         </div>
-      </div>
+      </ds-grid-item>
       <hc-post-card
         v-for="post in posts"
         :key="post.id"
@@ -22,7 +22,7 @@
         :width="{ base: '100%', xs: '100%', md: '50%', xl: '33%' }"
         @removePostFromList="deletePost(index, post.id)"
       />
-    </div>
+    </ds-grid>
     <no-ssr>
       <ds-button
         v-tooltip="{ content: 'Create a new Post', placement: 'left', delay: { show: 500 } }"