diff --git a/demo/client_side_rendering/src/components/SizeModal.vue b/demo/client_side_rendering/src/components/SizeModal.vue
index 2323954..a8bf94a 100644
--- a/demo/client_side_rendering/src/components/SizeModal.vue
+++ b/demo/client_side_rendering/src/components/SizeModal.vue
@@ -17,7 +17,11 @@
   <div class="size-modal-content">
     <div>A new paragraph will be added every 5 sec to show how <b>height</b> scales.</div>
     <div v-for="(p, i) in paragraphs" :key="i">
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla dictum purus egestas libero ornare venenatis. Maecenas pharetra tortor eu tortor imperdiet, a faucibus quam finibus. Nulla id lacinia quam. Praesent imperdiet sed magna non finibus. Aenean blandit, mauris vitae lacinia rutrum, nunc mi scelerisque sem, in laoreet sem lectus ut orci. Ut egestas nulla in vehicula feugiat. Vivamus tincidunt nisi vel risus dictum suscipit. Nulla id blandit mi, vulputate aliquam enim.
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla dictum purus egestas libero ornare venenatis.
+      Maecenas pharetra tortor eu tortor imperdiet, a faucibus quam finibus. Nulla id lacinia quam.
+      Praesent imperdiet sed magna non finibus. Aenean blandit, mauris vitae lacinia rutrum,
+      nunc mi scelerisque sem, in laoreet sem lectus ut orci. Ut egestas nulla in vehicula feugiat.
+      Vivamus tincidunt nisi vel risus dictum suscipit. Nulla id blandit mi, vulputate aliquam enim.
     </div>
   </div>
 </modal>
@@ -47,6 +51,7 @@
       opened (e) {
         // e.ref should not be undefined here
         console.log('opened', e)
+        console.log('ref', e.ref)
       },
 
       closed (e) {
diff --git a/src/Modal.vue b/src/Modal.vue
index bc0c64a..f7d0101 100644
--- a/src/Modal.vue
+++ b/src/Modal.vue
@@ -381,15 +381,14 @@
        * Generates event object
        */
       genEventObject (params) {
-        // @todo: clean this up (change to ...)
-        var data = {
+        var eventData = {
           name: this.name,
           timestamp: Date.now(),
           canceled: false,
           ref: this.$refs.modal
         }
 
-        return Object.assign(data, params || {})
+        return Object.assign(eventData, params || {})
       },
       /**
        * Event handler which is triggered on modal resize
@@ -421,6 +420,7 @@
         if (beforeEventName === 'before-open') {
           if (reset) {
             this.setInitialSize()
+
             this.shift.left = 0
             this.shift.top = 0
           }
@@ -631,8 +631,8 @@
   }
 
   .v--modal-overlay.scrollable .v--modal-box {
-    margin-bottom: 10px;
-    transition: top 0.2s ease;
+    margin-bottom: 2px;
+    /* transition: top 0.2s ease; */
   }
 
   .v--modal {