diff --git a/src/views/base/Switches.vue b/src/views/base/Switches.vue
index 8aa4ed49..2cd64b5e 100644
--- a/src/views/base/Switches.vue
+++ b/src/views/base/Switches.vue
@@ -20,17 +20,18 @@
               required
             /> -->
             <!-- <CSwitch class="mx-1" variant="primary" shape="3d" outline="alt" v-bind="labelIcon" type="radio" name="radio" checked.sync="radio" trueValue="primary"/> -->
-            <CSwitch class="mx-1"
-                     :key="key"
-                     :variant="variant"
-                     shape="3d"
-                     outline="alt"
-                     v-bind="labelIcon"
-                     type="radio"
-                     name="radio"
-                     :checked.sync="radio"
-                     :value="variant"
-                     v-for="(variant, key) in ['primary','secondary','warning','success','info','danger','light','dark']"
+            <CSwitch
+              class="mx-1"
+              :key="key"
+              :variant="variant"
+              shape="3d"
+              outline="alt"
+              v-bind="labelIcon"
+              type="radio"
+              name="radio"
+              :checked.sync="radio"
+              :value="variant"
+              v-for="(variant, key) in variants"
             />
           </CCardBody>
         </CCard>
@@ -520,6 +521,9 @@ export default {
   name: 'switches',
   data () {
     return {
+      variants:[
+        'primary','secondary','warning','success','info','danger','light','dark'
+      ],
       fields: [
         {key: 'size'},
         {key: 'example'},
diff --git a/src/views/base/Tables.vue b/src/views/base/Tables.vue
index a92d6a80..9f470b72 100644
--- a/src/views/base/Tables.vue
+++ b/src/views/base/Tables.vue
@@ -3,16 +3,20 @@
     <CRow>
       <CCol sm="12">
         <CCard headerHtml="CTable power presentation" bodyWrapper>
-          <CTable :items="items.slice(0)"
-                  :fields="fields"
-                  :perPage="6"
-                  indexColumn
-                  filterRow
-                  optionsRow
-                  loadings
-                  hover
-                  :defaultSorter="{ name:'username', direction:'desc'}"
-                  :defaultColumnFilter="{ role:'staff' }"
+          <CTable
+            :items="getItems()"
+            :fields="fields"
+            :perPage="6"
+            :activePage="page"
+            indexColumn
+            filterRow
+            optionsRow="noFilter"
+            loadings
+            hover
+            :defaultColumnFilter="{ role:'staff' }"
+            darkHeader
+            footer
+            :pagination="{size: 'lg'}"
           >
             <template #index-column="{index}">
               <td
@@ -53,6 +57,11 @@
               </CCollapse>
             </template>
           </CTable>
+          <!-- <CPagination
+            v-show="pages > 1"
+            :activePage.sync="page"
+            :pages="pages"
+          /> -->
         </CCard>
       </CCol>
     </CRow>
@@ -83,7 +92,7 @@
           :items="getItems()"
           caption="<i class='fa fa-align-justify'></i> Simple Table"
         />
-      </CCol><!--/.col-->
+      </CCol>
 
       <CCol lg="6">
         <CTableWrapper
@@ -91,7 +100,7 @@
           striped
           caption="<i class='fa fa-align-justify'></i> Striped Table"
         />
-      </CCol><!--/.col-->
+      </CCol>
     </CRow>
 
     <CRow>
@@ -101,7 +110,7 @@
           small
           caption="<i class='fa fa-align-justify'></i> Condensed Table"
         />
-      </CCol><!--/.col-->
+      </CCol>
 
       <CCol lg="6">
         <CTableWrapper
@@ -110,7 +119,7 @@
           bordered
           caption="<i class='fa fa-align-justify'></i> Bordered Table"
         />
-      </CCol><!--/.col-->
+      </CCol>
     </CRow>
 
     <CRow>
@@ -194,7 +203,7 @@ export default {
       fields: fields,
       page: 1,
       pages: null,
-      details: []
+      details: [],
     }
   },
   methods: {
diff --git a/src/views/buttons/BrandButtons.vue b/src/views/buttons/BrandButtons.vue
index ca1a0169..d51e31a3 100644
--- a/src/views/buttons/BrandButtons.vue
+++ b/src/views/buttons/BrandButtons.vue
@@ -95,7 +95,7 @@
             </p>
           </CCardBody>
         </CCard>
-      </CCol><!--/.col-->
+      </CCol>
       <CCol col="12">
         <CCard>
           <CCardHeader>
@@ -190,7 +190,7 @@
             </p>
           </CCardBody>
         </CCard>
-      </CCol><!--/.col-->
+      </CCol>
 
       <CCol col="12">
         <CCard>
@@ -286,7 +286,7 @@
             </p>
           </CCardBody>
         </CCard>
-      </CCol><!--/.col-->
+      </CCol>
     </CRow>
   </div>
 </template>
diff --git a/src/views/notifications/Modals.vue b/src/views/notifications/Modals.vue
index a673ac1c..a73ff065 100644
--- a/src/views/notifications/Modals.vue
+++ b/src/views/notifications/Modals.vue
@@ -38,7 +38,7 @@
               </CButton>
             </CCardBody>
           </CCard>
-        </CCol><!--/.col-->
+        </CCol>
       </CRow>
     </div>
     <!-- Modal Component -->