diff --git a/vuepress/.vuepress/components/datatable-basic.vue b/vuepress/.vuepress/components/datatable-basic.vue
new file mode 100644
index 0000000..7aca18d
--- /dev/null
+++ b/vuepress/.vuepress/components/datatable-basic.vue
@@ -0,0 +1,27 @@
+<template>
+    <datatable-example v-on:scriptsLoaded="initDatatable">
+        <div id="example-basic"></div>
+    </datatable-example>
+</template>
+<script>
+import DatatableExample from "./datatable-example";
+import { getSampleData } from "./datatableData";
+
+export default {
+  name: "DatatableBasic",
+  components: {
+      DatatableExample
+  },
+  methods: {
+    initDatatable() {
+      const { data } = getSampleData();
+      let columns = ['Name', {name: 'Position', width: 195}, 'Office', 'Extn.', 'Start Date', 'Salary'];
+      const datatable = new DataTable("#example-basic", {
+        columns,
+        data,
+        inlineFilters: true
+      });
+    }
+  }
+};
+</script>
diff --git a/vuepress/.vuepress/components/datatable-cell.vue b/vuepress/.vuepress/components/datatable-cell.vue
new file mode 100644
index 0000000..a9894ab
--- /dev/null
+++ b/vuepress/.vuepress/components/datatable-cell.vue
@@ -0,0 +1,34 @@
+<template>
+    <datatable-example v-on:scriptsLoaded="initDatatable">
+        <div id="example-cell"></div>
+    </datatable-example>
+</template>
+<script>
+import DatatableExample from "./datatable-example";
+import { getSampleData } from "./datatableData";
+
+export default {
+  name: "DatatableCell",
+  components: {
+    DatatableExample
+  },
+  methods: {
+    initDatatable() {
+      const { data } = getSampleData();
+      let columns = [
+        "Name",
+        { name: "Position", width: 185 },
+        { name: "Office" },
+        "Extn.",
+        "Start Date",
+        { name: "Salary", format: value => "$" + value }
+      ];
+
+      const datatable = new DataTable("#example-cell", {
+        columns,
+        data
+      });
+    }
+  }
+};
+</script>
diff --git a/vuepress/.vuepress/components/datatable-example.vue b/vuepress/.vuepress/components/datatable-example.vue
index 1877e1d..4c5ee18 100644
--- a/vuepress/.vuepress/components/datatable-example.vue
+++ b/vuepress/.vuepress/components/datatable-example.vue
@@ -1,48 +1,56 @@
 <template>
-    <div class="example">
-
+    <div>
+        <slot></slot>
     </div>
 </template>
 <script>
-import config from '../config';
-import { getSampleData } from './datatableData';
+import { getSampleData } from "./datatableData";
 
 export default {
-    name: 'DatatableExample',
-    props: ['type'],
-    mounted () {
-        this.loadScriptsAndStyle().then(() => {
-            const { columns, data } = getSampleData();
-            const datatable = new DataTable('.example', {
-                columns,
-                data,
-                // layout: 'fluid'
-            })
-        });
+  name: "DatatableExample",
+  props: ["type"],
+  mounted() {
+    this.loadScriptsAndStyle().then(() => {
+        this.$emit('scriptsLoaded');
+    });
+  },
+  methods: {
+    initDatatable() {
+      const { columns, data } = getSampleData();
+      const datatable = new DataTable("#example-" + this.type, {
+        columns,
+        data
+      });
     },
-    methods: {
-        loadScriptsAndStyle() {
-            return Promise.all([
-                this.loadScript('//unpkg.com/sortablejs@1.7.0/Sortable.min.js'),
-                this.loadScript('//unpkg.com/clusterize.js@0.18.1/clusterize.min.js'),
-                this.loadScript('//unpkg.com/frappe-datatable@0.0.6/dist/frappe-datatable.min.js'),
-                this.loadStyle('//unpkg.com/frappe-datatable@0.0.6/dist/frappe-datatable.min.css')
-            ])
-        },
-        loadScript(src) {
-            return new Promise(resolve => {
-                const script = document.createElement('script');
-                script.src = src;
-                script.onload = resolve;
-                document.body.appendChild(script);
-            });
-        },
-        loadStyle(src) {
-            const link = document.createElement('link');
-            link.rel = 'stylesheet';
-            link.href = src;
-            document.head.appendChild(link);
-        }
+    loadScriptsAndStyle() {
+      if (!window.scriptsLoadedPromise) {
+          window.scriptsLoadedPromise = Promise.all([
+            this.loadScript("//unpkg.com/sortablejs@1.7.0/Sortable.min.js"),
+            this.loadScript("//unpkg.com/clusterize.js@0.18.1/clusterize.min.js"),
+            this.loadScript("//unpkg.com/frappe-datatable@0.0.8/dist/frappe-datatable.min.js"),
+            this.loadStyle("//unpkg.com/frappe-datatable@0.0.8/dist/frappe-datatable.min.css")
+          ]);
+      }
+
+      return window.scriptsLoadedPromise;
+
+    },
+    loadScript(src) {
+      return new Promise(resolve => {
+        const script = document.createElement("script");
+        script.src = src;
+        script.async = false;
+        script.type = 'text/javascript';
+        script.onload = resolve;
+        document.body.appendChild(script);
+      });
+    },
+    loadStyle(src) {
+      const link = document.createElement("link");
+      link.rel = "stylesheet";
+      link.href = src;
+      document.head.appendChild(link);
     }
-}
+  }
+};
 </script>
diff --git a/vuepress/.vuepress/override.styl b/vuepress/.vuepress/override.styl
index aca0b31..73ec142 100644
--- a/vuepress/.vuepress/override.styl
+++ b/vuepress/.vuepress/override.styl
@@ -1 +1 @@
-@import "../../docs.styl"
\ No newline at end of file
+// @import "../../docs.styl"
\ No newline at end of file
diff --git a/vuepress/.vuepress/public/img/datatable-column-demo.gif b/vuepress/.vuepress/public/img/datatable-column-demo.gif
new file mode 100644
index 0000000..4b58b80
Binary files /dev/null and b/vuepress/.vuepress/public/img/datatable-column-demo.gif differ
diff --git a/vuepress/readme.md b/vuepress/readme.md
index be9946e..713a5cd 100644
--- a/vuepress/readme.md
+++ b/vuepress/readme.md
@@ -2,7 +2,7 @@
 home: true
 ---
 
-<datatable-example type="basic" />
+<datatable-basic />
 
 ## Installation
 
@@ -33,7 +33,7 @@ let datatable = new DataTable({
 });
 ```
 
-## Features
+## Cell Features
 
 * Custom Formatters
 * Inline Editing
@@ -42,6 +42,26 @@ let datatable = new DataTable({
 * Keyboard Navigation
 * Custom Cell Editor
 
+## Column Features
+
+* Reorder Columns
+* Sort by Column
+* Remove / Hide Column
+* Custom Actions
+* Resize Column
+* Flexible Layout
+
+<img :src="$withBase('/img/datatable-column-demo.gif')" />
+
+## Row Features
+
+* Row Selection
+* Tree Structured Rows
+* Inline Filters
+* Large Number of Rows
+* Dynamic Row Height
+
+
 <div class="footer">
 Made with ❤️ by Frappe
 </div>
@@ -56,6 +76,9 @@ Made with ❤️ by Frappe
     tr:nth-child(2n) {
         background-color: transparent;
     }
+    .content.custom > div {
+        height: 2000px;
+    }
     .home .hero .description {
         max-width: 30rem;
         font-size: 2rem;