diff --git a/pinry/static/js/vue/main.js b/pinry/static/js/vue/main.js
index 85aef59..0ccd52d 100644
--- a/pinry/static/js/vue/main.js
+++ b/pinry/static/js/vue/main.js
@@ -24,7 +24,6 @@ function EventCounter(countEvent, triggerEvent, triggerTimes) {
     countEvent,
     function() {
       self.count += 1;
-      console.log(self.id, self.count);
       if (self.count >= self.targetCount) {
         events.$emit(triggerEvent)
       }
@@ -83,6 +82,18 @@ function HeightTable(blockMargin) {
   self.getHeightOffset = function (index, rowSize) {
     return getHeightOffset(self, index, rowSize);
   };
+  self.getMaxHeight = function(rowSize, blockMargin) {
+    var size = Object.keys(self.data).length;
+    var heightArray = [];
+    for (var column = 0; column < rowSize; column ++) {
+      heightArray.push(0);
+    }
+    for (var index = 0; index < size; index++) {
+      var column = index % rowSize;
+      heightArray[column] = heightArray[column] + self.get(index) + blockMargin;
+    }
+    return Math.max(...heightArray);
+  };
   return self;
 }
 
@@ -111,13 +122,15 @@ Vue.component('pin', {
     this.reflow();
     this.$emit("rendered", {index: this.index, height: this.height});
   },
+  updated: function() {
+    events.$emit(eventsName.pinReflowDone);
+  },
   methods: {
     reflow: function() {
       this.heightOffset = this.heightTable.getHeightOffset(this.index, this.args.rowSize);
       this.imageStyle = this.getImageStyle();
       this.pinStyle = this.getPinStyle();
       this.height = this.getTextHeight() + this.pin.image.thumbnail.height;
-      events.$emit(eventsName.pinReflowDone);
     },
     getImageStyle: function() {
       return {
@@ -192,6 +205,7 @@ Vue.component('pin-container', {
       "pins": [],
       "heightTable": [],
       "counter": null,
+      "containerStyle": null,
       status: {
         loading: true,
         hasNext: true,
@@ -220,7 +234,13 @@ Vue.component('pin-container', {
   },
   methods: {
     updateContainerStyle: function() {
-
+      var height = this.heightTable.getMaxHeight(
+        this.args.rowSize,
+        this.args.blockMargin,
+      );
+      this.containerStyle = {
+        height: height + "px",
+      };
     },
     loadMore() {
       var self = this;
diff --git a/pinry/templates/core/pins.html b/pinry/templates/core/pins.html
index 6ae4777..262721e 100644
--- a/pinry/templates/core/pins.html
+++ b/pinry/templates/core/pins.html
@@ -8,5 +8,7 @@
   >
   </pin-container>
   <div v-show="loading" class="spinner"></div>
-  <div v-show="noMore">&mdash; End &mdash;</div>
+  <template v-if="noMore">
+    <div id="the-end">&mdash; End &mdash;</div>
+  </template>
 {% endblock %}
diff --git a/pinry/templates/includes/vue-pin.html b/pinry/templates/includes/vue-pin.html
index 01e0213..6d5486b 100644
--- a/pinry/templates/includes/vue-pin.html
+++ b/pinry/templates/includes/vue-pin.html
@@ -1,7 +1,7 @@
 {% verbatim %}
 
 <script type="text/x-template" id="pin-container-template">
-  <div id="pins">
+  <div id="pins" :style="containerStyle">
     <template v-for="(item, index) in pins">
       <pin
           :pin="item"