diff --git a/demo/controllers/article/imageInContent.vue b/demo/controllers/article/imageInContent.vue
index 3194ca37..62ec824c 100644
--- a/demo/controllers/article/imageInContent.vue
+++ b/demo/controllers/article/imageInContent.vue
@@ -34,7 +34,7 @@ export default {
 
             return [{
                 icon: 'move',
-                isSortHandle:true
+                isSortHandle: true
             }, this.alignment === 'central' ? {
                 icon: 'arrowLeft',
                 action: () => this.updateComponent({alignment: 'left'})
diff --git a/demo/controllers/article/quoteInContent.vue b/demo/controllers/article/quoteInContent.vue
index 8e4529ba..77b67365 100644
--- a/demo/controllers/article/quoteInContent.vue
+++ b/demo/controllers/article/quoteInContent.vue
@@ -74,5 +74,4 @@ export default {
     border: 0; color: $colorGrayDark2; background: #fff;
 }
 
-
 </style>
diff --git a/demo/controllers/article/tableInContent.vue b/demo/controllers/article/tableInContent.vue
index 60934e94..4b4bd4d5 100644
--- a/demo/controllers/article/tableInContent.vue
+++ b/demo/controllers/article/tableInContent.vue
@@ -44,34 +44,36 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr v-for="(row, rowIndex) in rows" v-if="rowIndex !== 0">
-                        <td v-for="(cell, cellIndex) in row" :key="cellIndex">
-                            <textarea-form-element
-                                :value="cell" :attributes="getInputAttributes('cell')"
-                                @input="updateCell(rowIndex, cellIndex, $event)"
-                            ></textarea-form-element>
-                        </td>
-                        <td class="dropdownCell">
-                            <div class="dropdown" :class="{
-                                active: activeDropdown === 'row' + rowIndex
-                            }">
-                                <button
-                                    type="button" @click="toggleDropdown('row' + rowIndex)"
-                                    class="dropdownToggle nBtn icr iconMoreHorizontal"
-                                    tabindex="-1"
-                                >More</button>
-                                <ul
-                                    class="dropdownList"
-                                    v-if="activeDropdown === 'row' + rowIndex"
-                                    v-on-dismiss="closeDropdown"
-                                >
-                                    <li @click="removeRow(rowIndex)">Remove row</li>
-                                    <li @click="addRow(rowIndex)">Insert row above</li>
-                                    <li @click="addRow(rowIndex + 1)">Insert row bellow</li>
-                                </ul>
-                            </div>
-                        </td>
-                    </tr>
+                    <template v-for="(row, rowIndex) in rows">
+                        <tr v-if="rowIndex !== 0" :key="rowIndex">
+                            <td v-for="(cell, cellIndex) in row" :key="cellIndex">
+                                <textarea-form-element
+                                    :value="cell" :attributes="getInputAttributes('cell')"
+                                    @input="updateCell(rowIndex, cellIndex, $event)"
+                                ></textarea-form-element>
+                            </td>
+                            <td class="dropdownCell">
+                                <div class="dropdown" :class="{
+                                    active: activeDropdown === 'row' + rowIndex
+                                }">
+                                    <button
+                                        type="button" @click="toggleDropdown('row' + rowIndex)"
+                                        class="dropdownToggle nBtn icr iconMoreHorizontal"
+                                        tabindex="-1"
+                                    >More</button>
+                                    <ul
+                                        class="dropdownList"
+                                        v-if="activeDropdown === 'row' + rowIndex"
+                                        v-on-dismiss="closeDropdown"
+                                    >
+                                        <li @click="removeRow(rowIndex)">Remove row</li>
+                                        <li @click="addRow(rowIndex)">Insert row above</li>
+                                        <li @click="addRow(rowIndex + 1)">Insert row bellow</li>
+                                    </ul>
+                                </div>
+                            </td>
+                        </tr>
+                    </template>
                 </tbody>
             </table>
         </div>
@@ -89,7 +91,6 @@
 <script>
 import TextareaFormElement from 'trim/formElements/textarea';
 import baseComponent from 'trim/formElements/htmlComponents/baseComponent';
-import ExternalAdmin from 'trim/formElements/externalAdmin';
 import vueDismiss from 'vue-dismiss';
 
 export default {
diff --git a/demo/controllers/category.js b/demo/controllers/category.js
index bb778850..1a3d0796 100644
--- a/demo/controllers/category.js
+++ b/demo/controllers/category.js
@@ -170,6 +170,7 @@ export default {
                 return sibling.get('position') !== index + 1
                     ? updatePosition(sibling, index + 1)
                     : null
+                ;
             })).then(() => {
                 const oldPosition = model.get('position');
                 const newPosition = oldPosition + offset;
@@ -179,7 +180,7 @@ export default {
                 return Promise.all([
                     updatePosition(model, newPosition),
                     updatePosition(otherModel, oldPosition)
-                ])
+                ]);
             });
         };
 
diff --git a/demo/dummy.vue b/demo/dummy.vue
index d1de1777..70f0b2a1 100644
--- a/demo/dummy.vue
+++ b/demo/dummy.vue
@@ -7,7 +7,7 @@ export default {
     data: () => ({
         isDummy: true
     })
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/demo/mainNavigation.js b/demo/mainNavigation.js
index 8d1f682d..31477622 100644
--- a/demo/mainNavigation.js
+++ b/demo/mainNavigation.js
@@ -1,4 +1,4 @@
-import auth from './auth';
+// import auth from './auth';
 import server from 'apiServer';
 import DummyComponent from './dummy';
 
@@ -76,7 +76,7 @@ export default {
 
         {
             caption: 'My settings',
-            url: router.url('mySettings'),
+            url: router.url('mySettings')
         },
 
         {
diff --git a/webpack.config.js b/webpack.config.js
index 66a64112..3d7a348d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -58,8 +58,8 @@ module.exports = {
                 enforce: 'pre',
                 include: [
                     path.join(__dirname, 'src'),
-                    path.join(__dirname, 'src/demo'),
-                    path.join(__dirname, 'spec'),
+                    path.join(__dirname, 'demo'),
+                    path.join(__dirname, 'spec')
                 ],
             },
             {