diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue
index 55f57a56..b300720d 100644
--- a/src/containers/DefaultContainer.vue
+++ b/src/containers/DefaultContainer.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="c-app c-default-layout">
     <TheHeader/>
+    <TheSidebar/>
     <div class="c-body">
-      <TheSidebar/>
       <main class="c-main">
         <CBreadcrumbRouter/>
         <CContainer fluid>
diff --git a/src/main.js b/src/main.js
index d825f591..cc3f4e68 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,23 +10,17 @@ import '@babel/polyfill'
 import Vue from 'vue'
 import App from './App'
 import router from './router'
-import CoreuiVue from '@coreui/vue/src'
+// import CoreuiVue from '@coreui/vue/src'
 import { CIconPlugin } from '@coreui/icons/vue'
 import { iconsSet } from './assets/icons/icons.js'
 
-// import CoreuiVue from '@coreui/vue'
-// import CoreuiVue from '@coreui/vue/dist/custom.common.js'
+import CoreuiVue from '@coreui/vue'
 
 Vue.config.performance = true
-
-// todo
-// cssVars()
 Vue.use(CoreuiVue)
-// console.log(iconsSet)
 Vue.use(CIconPlugin, iconsSet)
 
-/* eslint-disable no-new */
-var vm = new Vue({
+new Vue({
   el: '#app',
   router,
   template: '<App/>',
diff --git a/src/views/base/Forms.vue b/src/views/base/Forms.vue
index 8121e3b7..a2935045 100644
--- a/src/views/base/Forms.vue
+++ b/src/views/base/Forms.vue
@@ -200,7 +200,7 @@
                   </CCol>
                   <CCol sm="9" :class="key % 2 === 1 ? 'c-form-inline' : ''">
                     <CFormRadio
-                      v-for="(option, optKey) in options"
+                      v-for="option in options"
                       :key="option"
                       :label="option"
                       type="radio"
@@ -853,7 +853,6 @@ export default {
       trueValue:'someTrueValue',
       falseValue:'someFalseValue',
       checks: ['someTrueValue','hehehe2','',1,1,1,1,1,1,1,1,1,1,1,1],
-      selected: 'first',
       isValid: '',
       testkkk: 2,
       horizontal: { label:'col-3', input:'col-9' },
@@ -874,11 +873,6 @@ export default {
     console.log('parent updated')
   },
   methods: {
-    testt (e) {
-      // console.log(e)
-      //   this.selected = 3
-      this.cInput += 100
-    },
     validator (val) {
       return val ? val.length >= 4 : false
     }
diff --git a/src/views/base/Table.vue b/src/views/base/Table.vue
index 5197a56e..955fb6ac 100644
--- a/src/views/base/Table.vue
+++ b/src/views/base/Table.vue
@@ -22,7 +22,6 @@
 </template>
 
 <script>
-import items from '../users/UsersData'
 export default {
   name: 'TableWrapper',
   props: {
diff --git a/src/views/buttons/ButtonGroups.vue b/src/views/buttons/ButtonGroups.vue
index cf245147..628b8471 100644
--- a/src/views/buttons/ButtonGroups.vue
+++ b/src/views/buttons/ButtonGroups.vue
@@ -143,7 +143,7 @@
               <div>
                 <CButtonToolbar
                   aria-label="Toolbar with button groups and input groups"
-                  class="c-d-sm-down-none"c-
+                  class="c-d-sm-down-none"
                 >
                   <CButtonGroup size="sm" class="c-mx-1">
                     <CButton>New</CButton>
diff --git a/src/views/charts/CChartBarExample.vue b/src/views/charts/CChartBarExample.vue
index daae013a..eeb129e7 100644
--- a/src/views/charts/CChartBarExample.vue
+++ b/src/views/charts/CChartBarExample.vue
@@ -6,7 +6,6 @@
 </template>
 
 <script>
-import { customTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
 import { CChartBar } from '@coreui/coreui-vue-chartjs'
 
 export default {
diff --git a/src/views/charts/CChartLineExample.vue b/src/views/charts/CChartLineExample.vue
index 5b75e932..52f26039 100644
--- a/src/views/charts/CChartLineExample.vue
+++ b/src/views/charts/CChartLineExample.vue
@@ -6,7 +6,6 @@
 </template>
 
 <script>
-import { customTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
 import { CChartLine } from '@coreui/coreui-vue-chartjs'
 
 export default {
diff --git a/src/views/charts/CChartPolarAreaExample.vue b/src/views/charts/CChartPolarAreaExample.vue
index ee9679ff..af960f6a 100644
--- a/src/views/charts/CChartPolarAreaExample.vue
+++ b/src/views/charts/CChartPolarAreaExample.vue
@@ -10,7 +10,6 @@
 </template>
 
 <script>
-import { customTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
 import { CChartPolarArea } from '@coreui/coreui-vue-chartjs'
 
 export default {
diff --git a/src/views/charts/CChartRadarExample.vue b/src/views/charts/CChartRadarExample.vue
index 0d65f654..39b1db33 100644
--- a/src/views/charts/CChartRadarExample.vue
+++ b/src/views/charts/CChartRadarExample.vue
@@ -10,7 +10,6 @@
 </template>
 
 <script>
-import { customTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
 import { CChartRadar } from '@coreui/coreui-vue-chartjs'
 
 export default {
diff --git a/src/views/charts/CalloutChartExample.vue b/src/views/charts/CalloutChartExample.vue
index 22c5b80a..33afebd0 100644
--- a/src/views/charts/CalloutChartExample.vue
+++ b/src/views/charts/CalloutChartExample.vue
@@ -64,12 +64,6 @@ export default {
         }
       }
     }
-  },
-
-  methods: {
-    getVariant (val, el) {
-      return val[0] === '#' ? val : getStyle(`--${val}`, el)
-    }
   }
 }
 </script>
diff --git a/src/views/charts/MainChartExample.vue b/src/views/charts/MainChartExample.vue
index 46902d85..245176d8 100644
--- a/src/views/charts/MainChartExample.vue
+++ b/src/views/charts/MainChartExample.vue
@@ -9,7 +9,6 @@
 <script>
 import { CChartLine } from '@coreui/coreui-vue-chartjs'
 import { getColor, hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities'
-import { customTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
 
 function random (min, max) {
   return Math.floor(Math.random() * (max - min + 1) + min)
@@ -65,7 +64,7 @@ export default {
     },
     defaultOptions () {
       return {
-      
+
         maintainAspectRatio: false,
         legend: {
           display: false
diff --git a/src/views/icons/Brands.vue b/src/views/icons/Brands.vue
index c2c46ecb..74db47ce 100644
--- a/src/views/icons/Brands.vue
+++ b/src/views/icons/Brands.vue
@@ -18,7 +18,7 @@
               class="c-mb-5"
               col="3"
               sm="2"
-              :key="key"
+              :key="brandName"
             >
               <CIcon :height="42" :content="$options.brands[brandName]"/>
               <div>{{brandName}}</div>
diff --git a/src/views/notifications/Alerts.vue b/src/views/notifications/Alerts.vue
index cb75242e..53e1856e 100644
--- a/src/views/notifications/Alerts.vue
+++ b/src/views/notifications/Alerts.vue
@@ -196,9 +196,6 @@ export default {
       dismissSecs: 10,
       dismissCountDown: 10,
       dismissibleAlerts: [true, true, true, true, true],
-      // dismissibleAlert: true,
-      // dismissibleAlert2: true,
-      // dismissibleAlert3: true
     }
   },
   methods: {
@@ -209,12 +206,7 @@ export default {
       this.dismissCountDown = this.dismissSecs
     },
     showDismissibleAlerts () {
-      // this.dismissibleAlert = true
-      // this.dismissibleAlert2 = true
-      // this.dismissibleAlert3 = true
-      this.dismissibleAlerts = this.dismissibleAlerts.map(
-        alert => alert = true
-      )
+      this.dismissibleAlerts = this.dismissibleAlerts.map(el => el = true)
     }
   }
 }
diff --git a/src/views/users/Users.vue b/src/views/users/Users.vue
index 19201435..34f1fad7 100644
--- a/src/views/users/Users.vue
+++ b/src/views/users/Users.vue
@@ -11,7 +11,7 @@
             :current-page="currentPage"
             :per-page="perPage"
             @row-clicked="rowClicked"
-            :pagination-props="$options.paginationProps"
+            :pagination="$options.paginationProps"
           >
             <td slot="id" slot-scope="data">
               <strong>{{data.item.id}}</strong>
@@ -51,11 +51,10 @@ export default {
     }
   },
   paginationProps: {
-    // size: 'sm',
     align: 'center',
     hideDoubleArrows: true,
-    previousButtonText: 'prev',
-    nextButtonText: 'next'
+    previousButtonHtml: 'prev',
+    nextButtonHtml: 'next'
   },
   methods: {
     getBadge (status) {