diff --git a/CHANGELOG.md b/CHANGELOG.md
index 250bef9d..5336633c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## [vue](./README.md) version `changelog`
 
+##### `v1.0.10`
+- fix: `className` -> `class`
+- refactor: `<b-input-group-prepend>`
+- refactor: `<b-input-group-append>`
+- refactor: `<b-input-group-text>`
+- refactor: remove `<b-input-group-button>`
+- test: initial `Dashboard` unit test added
+- update: bootstrap-vue to `2.0.0-rc.1`
+- chore: dependencies update
+
 ###### `v1.0.9`
 - refactor: Sidebar structure
 - test: initial e2e test added
diff --git a/Vue_Full_Project/CHANGELOG.md b/Vue_Full_Project/CHANGELOG.md
index 250bef9d..5336633c 100644
--- a/Vue_Full_Project/CHANGELOG.md
+++ b/Vue_Full_Project/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## [vue](./README.md) version `changelog`
 
+##### `v1.0.10`
+- fix: `className` -> `class`
+- refactor: `<b-input-group-prepend>`
+- refactor: `<b-input-group-append>`
+- refactor: `<b-input-group-text>`
+- refactor: remove `<b-input-group-button>`
+- test: initial `Dashboard` unit test added
+- update: bootstrap-vue to `2.0.0-rc.1`
+- chore: dependencies update
+
 ###### `v1.0.9`
 - refactor: Sidebar structure
 - test: initial e2e test added
diff --git a/Vue_Full_Project/package-lock.json b/Vue_Full_Project/package-lock.json
index a51bd334..5616b2e8 100644
--- a/Vue_Full_Project/package-lock.json
+++ b/Vue_Full_Project/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/vue",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -66,7 +66,7 @@
         "@babel/types": "7.0.0-beta.36",
         "babylon": "7.0.0-beta.36",
         "debug": "3.1.0",
-        "globals": "11.1.0",
+        "globals": "11.3.0",
         "invariant": "2.2.2",
         "lodash": "4.17.4"
       },
@@ -87,9 +87,9 @@
           }
         },
         "globals": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz",
-          "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==",
+          "version": "11.3.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
+          "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==",
           "dev": true
         }
       }
@@ -140,9 +140,9 @@
       }
     },
     "acorn": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
-      "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz",
+      "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -538,7 +538,7 @@
         "caniuse-lite": "1.0.30000792",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
-        "postcss": "6.0.16",
+        "postcss": "6.0.17",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -1450,6 +1450,17 @@
         "callsite": "1.0.0"
       }
     },
+    "bfj-node4": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bfj-node4/-/bfj-node4-5.2.0.tgz",
+      "integrity": "sha512-shYA6rXr1mlAzJT8R96TscvicMyV9GJTMDFRii9HlgxLXT7HD3aDfsEHkQzIHYghh4jLI3+oouXDHqI+pnR3zA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "check-types": "7.3.0",
+        "tryer": "1.0.0"
+      }
+    },
     "big.js": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
@@ -1572,10 +1583,11 @@
       "integrity": "sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA=="
     },
     "bootstrap-vue": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-1.4.1.tgz",
-      "integrity": "sha512-TXQ28trpKPkdJS/SlcvKOS5DTWxUPkyhGf19urUG1r6Cq6YrzNI+kMipzGpj46XFlYu0WUutzOa9KraYyPLDBQ==",
+      "version": "2.0.0-rc.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.1.tgz",
+      "integrity": "sha512-X9dr6gKi3pF3K2yMJah7nYhlo/HB3JLJQ+grr8442s/HJsfnW9P1iALJtmiAxH8/RXLCSes00gs4lYlP0zg21w==",
       "requires": {
+        "bootstrap": "4.0.0",
         "lodash.startcase": "4.4.0",
         "opencollective": "1.0.3",
         "popper.js": "1.12.9",
@@ -1694,7 +1706,7 @@
         "syntax-error": "1.3.0",
         "through2": "2.0.3",
         "timers-browserify": "1.4.2",
-        "tty-browserify": "0.0.0",
+        "tty-browserify": "0.0.1",
         "url": "0.11.0",
         "util": "0.10.3",
         "vm-browserify": "0.0.4",
@@ -1813,7 +1825,7 @@
       "dev": true,
       "requires": {
         "caniuse-lite": "1.0.30000792",
-        "electron-to-chromium": "1.3.31"
+        "electron-to-chromium": "1.3.32"
       }
     },
     "buffer": {
@@ -1883,7 +1895,7 @@
         "glob": "7.1.2",
         "graceful-fs": "4.1.11",
         "lru-cache": "4.1.1",
-        "mississippi": "1.3.0",
+        "mississippi": "1.3.1",
         "mkdirp": "0.5.1",
         "move-concurrently": "1.0.1",
         "promise-inflight": "1.0.1",
@@ -1953,7 +1965,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000793",
+        "caniuse-db": "1.0.30000800",
         "lodash.memoize": "4.1.2",
         "lodash.uniq": "4.5.0"
       },
@@ -1964,16 +1976,16 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000793",
-            "electron-to-chromium": "1.3.31"
+            "caniuse-db": "1.0.30000800",
+            "electron-to-chromium": "1.3.32"
           }
         }
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000793",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000793.tgz",
-      "integrity": "sha1-PADGbkI6ehkHx92Wdpp4sq+opy4=",
+      "version": "1.0.30000800",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000800.tgz",
+      "integrity": "sha1-qG5rwjvZpwfV30LzPmTQSVz9ohg=",
       "dev": true
     },
     "caniuse-lite": {
@@ -2009,7 +2021,7 @@
         "deep-eql": "3.0.1",
         "get-func-name": "2.0.0",
         "pathval": "1.1.0",
-        "type-detect": "4.0.7"
+        "type-detect": "4.0.8"
       }
     },
     "chai-nightwatch": {
@@ -2122,6 +2134,12 @@
       "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
       "dev": true
     },
+    "check-types": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.3.0.tgz",
+      "integrity": "sha1-Ro9XGkQ1wkJI9f0MsOjYfDw0Hn0=",
+      "dev": true
+    },
     "chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -2146,9 +2164,9 @@
       "dev": true
     },
     "chromedriver": {
-      "version": "2.34.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.34.1.tgz",
-      "integrity": "sha512-ivXrPKKtnX442J8Lkbhb8hJ5+lelzAqrAI9VjVs3/iujm396JnJYXGGGjniPXvQeLVE3HDIWwsHu8goIUq3rMQ==",
+      "version": "2.35.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.35.0.tgz",
+      "integrity": "sha512-zqvC/HKybRxiM68GzByvUaXxTmNCmpETvLQIM92IEdrQxPnONKt3ZdTsiwxmGrL2ZIDbr9OEHJljmhZZMEsFPw==",
       "dev": true,
       "requires": {
         "del": "3.0.0",
@@ -2483,7 +2501,7 @@
           "dev": true,
           "requires": {
             "debug": "2.6.9",
-            "encodeurl": "1.0.1",
+            "encodeurl": "1.0.2",
             "escape-html": "1.0.3",
             "on-finished": "2.3.0",
             "parseurl": "1.3.2",
@@ -2685,7 +2703,7 @@
         "cipher-base": "1.0.4",
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
-        "sha.js": "2.4.9"
+        "sha.js": "2.4.10"
       }
     },
     "create-hmac": {
@@ -2699,7 +2717,7 @@
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
+        "sha.js": "2.4.10"
       }
     },
     "cross-env": {
@@ -2710,15 +2728,30 @@
       "requires": {
         "cross-spawn": "5.1.0",
         "is-windows": "1.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
+        }
       }
     },
     "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.4.tgz",
+      "integrity": "sha512-LDYnK41m8td+nBTk5Jmn55aGVP18iYuUqoM1X3u+ptt7M/g9FPS8C38PNoJTMfjoNx4fmiwWToPpiZklGRLbIA==",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
+        "nice-try": "1.0.4",
+        "path-key": "2.0.1",
+        "semver": "5.5.0",
         "shebang-command": "1.2.0",
         "which": "1.3.0"
       }
@@ -2824,7 +2857,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -2953,7 +2986,7 @@
           "dev": true,
           "requires": {
             "browserslist": "1.7.7",
-            "caniuse-db": "1.0.30000793",
+            "caniuse-db": "1.0.30000800",
             "normalize-range": "0.1.2",
             "num2fraction": "1.2.2",
             "postcss": "5.2.18",
@@ -2966,8 +2999,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000793",
-            "electron-to-chromium": "1.3.31"
+            "caniuse-db": "1.0.30000800",
+            "electron-to-chromium": "1.3.32"
           }
         },
         "chalk": {
@@ -3004,7 +3037,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -3138,7 +3171,7 @@
       "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
       "dev": true,
       "requires": {
-        "type-detect": "4.0.7"
+        "type-detect": "4.0.8"
       }
     },
     "deep-is": {
@@ -3247,7 +3280,7 @@
       "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
       "dev": true,
       "requires": {
-        "acorn": "5.3.0",
+        "acorn": "5.4.1",
         "defined": "1.0.0"
       }
     },
@@ -3439,9 +3472,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.31",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz",
-      "integrity": "sha512-XE4CLbswkZgZFn34cKFy1xaX+F5LHxeDLjY1+rsK9asDzknhbrd9g/n/01/acbU25KTsUSiLKwvlLyA+6XLUOA==",
+      "version": "1.3.32",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz",
+      "integrity": "sha1-EdBoTAhA4APEvoko+KxfNdvCtOY=",
       "dev": true
     },
     "elliptic": {
@@ -3466,9 +3499,9 @@
       "dev": true
     },
     "encodeurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
       "dev": true
     },
     "encoding": {
@@ -3634,9 +3667,9 @@
       }
     },
     "es6-promise": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.2.tgz",
-      "integrity": "sha512-LSas5vsuA6Q4nEdf9wokY5/AJYXry98i0IzXsv49rYsgDGDNDPbqAYR1Pe23iFxygfbGZNR/5VrHXBCh2BhvUQ==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
+      "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
       "dev": true
     },
     "es6-set": {
@@ -3726,9 +3759,9 @@
       }
     },
     "eslint": {
-      "version": "4.15.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz",
-      "integrity": "sha512-zEO/Z1ZUxIQ+MhDVKkVTUYpIPDTEJLXGMrkID+5v1NeQHtCz6FZikWuFRgxE1Q/RV2V4zVl1u3xmpPADHhMZ6A==",
+      "version": "4.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz",
+      "integrity": "sha512-YVXV4bDhNoHHcv0qzU4Meof7/P26B4EuaktMi5L1Tnt52Aov85KmYA8c5D+xyZr/BkhvwUqr011jDSD/QTULxg==",
       "dev": true,
       "requires": {
         "ajv": "5.5.2",
@@ -3746,11 +3779,11 @@
         "file-entry-cache": "2.0.0",
         "functional-red-black-tree": "1.0.1",
         "glob": "7.1.2",
-        "globals": "11.1.0",
+        "globals": "11.3.0",
         "ignore": "3.3.7",
         "imurmurhash": "0.1.4",
         "inquirer": "3.0.6",
-        "is-resolvable": "1.0.1",
+        "is-resolvable": "1.1.0",
         "js-yaml": "3.10.0",
         "json-stable-stringify-without-jsonify": "1.0.1",
         "levn": "0.3.0",
@@ -3776,6 +3809,17 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
+        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -3792,9 +3836,9 @@
           "dev": true
         },
         "globals": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz",
-          "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==",
+          "version": "11.3.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
+          "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==",
           "dev": true
         },
         "js-yaml": {
@@ -3819,9 +3863,9 @@
       }
     },
     "eslint-config-standard": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-      "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
+      "version": "11.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0-beta.0.tgz",
+      "integrity": "sha512-f+vs5HAHQo7NRZ3hVe+UVdT5DbebMNaFTWFp95orJ0LUdYPoWdM8xw/bMeO/IZMvHOPmIteGKGc2QOhSXd5nRg==",
       "dev": true
     },
     "eslint-friendly-formatter": {
@@ -3916,9 +3960,9 @@
       }
     },
     "eslint-plugin-html": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-4.0.1.tgz",
-      "integrity": "sha512-w8mmUJQjtDMUNbw3NOa4+PjOH/r4W5T+RN2nCmYgXv+QHx+NiBodnbPHXmJFJgo7Dr0Yk4G/2LCIRhfKceNmNA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-4.0.2.tgz",
+      "integrity": "sha512-CrQd0F8GWdNWnu4PFrYZl+LjUCXNVy2h0uhDMtnf/7VKc9HRcnkXSrlg0BSGfptZPSzmwnnwCaREAa9+fnQhYw==",
       "dev": true,
       "requires": {
         "htmlparser2": "3.9.2"
@@ -4062,7 +4106,7 @@
       "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==",
       "dev": true,
       "requires": {
-        "acorn": "5.3.0",
+        "acorn": "5.4.1",
         "acorn-jsx": "3.0.1"
       }
     },
@@ -4160,6 +4204,19 @@
         "p-finally": "1.0.0",
         "signal-exit": "3.0.2",
         "strip-eof": "1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
+        }
       }
     },
     "expand-braces": {
@@ -4239,7 +4296,7 @@
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "1.1.2",
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
         "finalhandler": "1.1.0",
@@ -4433,7 +4490,7 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "on-finished": "2.3.0",
         "parseurl": "1.3.2",
@@ -5827,12 +5884,13 @@
       "dev": true
     },
     "gzip-size": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
-      "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz",
+      "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=",
       "dev": true,
       "requires": {
-        "duplexer": "0.1.1"
+        "duplexer": "0.1.1",
+        "pify": "3.0.0"
       }
     },
     "handlebars": {
@@ -6075,7 +6133,7 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.3.7"
+        "uglify-js": "3.3.9"
       }
     },
     "html-webpack-plugin": {
@@ -6263,7 +6321,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.16"
+        "postcss": "6.0.17"
       }
     },
     "ieee754": {
@@ -6696,9 +6754,9 @@
       "dev": true
     },
     "is-resolvable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz",
-      "integrity": "sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-stream": {
@@ -6887,9 +6945,9 @@
       }
     },
     "js-base64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.1.tgz",
-      "integrity": "sha512-2h586r2I/CqU7z1aa1kBgWaVAXWAZK+zHnceGi/jFgn7+7VSluxYer/i3xOZVearCxxXvyDkLtTBo+OeJCA3kA==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz",
+      "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==",
       "dev": true
     },
     "js-tokens": {
@@ -7050,7 +7108,7 @@
         "socket.io": "2.0.4",
         "source-map": "0.6.1",
         "tmp": "0.0.33",
-        "useragent": "2.2.1"
+        "useragent": "2.3.0"
       }
     },
     "karma-coverage": {
@@ -7649,27 +7707,12 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        }
+        "chalk": "2.3.0"
       }
     },
     "log4js": {
@@ -7902,9 +7945,9 @@
       "dev": true
     },
     "lolex": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz",
-      "integrity": "sha512-mQuW55GhduF3ppo+ZRUTz1PRjEh1hS5BbqU7d8D0ez2OKxHDod7StPPeAVKisZR5aLkHZjdGWSL42LSONUJsZw==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
+      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==",
       "dev": true
     },
     "longest": {
@@ -8086,7 +8129,7 @@
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "memory-fs": {
@@ -8182,9 +8225,9 @@
       }
     },
     "mimic-fn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
     "minimalistic-assert": {
       "version": "1.0.0",
@@ -8213,9 +8256,9 @@
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "mississippi": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz",
-      "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz",
+      "integrity": "sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg==",
       "dev": true,
       "requires": {
         "concat-stream": "1.6.0",
@@ -8522,6 +8565,12 @@
       "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=",
       "dev": true
     },
+    "nice-try": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
+      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
+      "dev": true
+    },
     "nightwatch": {
       "version": "0.9.19",
       "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-0.9.19.tgz",
@@ -8558,9 +8607,9 @@
       }
     },
     "nise": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz",
-      "integrity": "sha512-q9jXh3UNsMV28KeqI43ILz5+c3l+RiNW8mhurEwCKckuHQbL+hTJIKKTiUlCPKlgQ/OukFvSnKB/Jk3+sFbkGA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.2.tgz",
+      "integrity": "sha512-rvxf+PSZeCKtP0DgmwMmNf1G3I6X1r4WHiP2H88PlIkOkt7mGqufdokjS8caoHBgZzVx0ee/5ytGcGHbZaUw8w==",
       "dev": true,
       "requires": {
         "formatio": "1.2.0",
@@ -8664,7 +8713,7 @@
         "stream-browserify": "2.0.1",
         "stream-http": "2.8.0",
         "string_decoder": "1.0.3",
-        "timers-browserify": "2.0.4",
+        "timers-browserify": "2.0.6",
         "tty-browserify": "0.0.0",
         "url": "0.11.0",
         "util": "0.10.3",
@@ -8683,13 +8732,19 @@
           }
         },
         "timers-browserify": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
-          "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz",
+          "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==",
           "dev": true,
           "requires": {
             "setimmediate": "1.0.5"
           }
+        },
+        "tty-browserify": {
+          "version": "0.0.0",
+          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+          "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+          "dev": true
         }
       }
     },
@@ -9120,7 +9175,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "opencollective": {
@@ -9223,30 +9278,15 @@
       }
     },
     "ora": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz",
-      "integrity": "sha1-gAeN0rkqk0r2ajrXKluRBpTt5Ro=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz",
+      "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
+        "chalk": "2.3.0",
         "cli-cursor": "2.1.0",
         "cli-spinners": "1.1.0",
-        "log-symbols": "1.0.2"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        }
+        "log-symbols": "2.2.0"
       }
     },
     "os-browserify": {
@@ -9554,7 +9594,7 @@
         "create-hmac": "1.1.6",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
+        "sha.js": "2.4.10"
       }
     },
     "pend": {
@@ -9575,7 +9615,7 @@
       "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=",
       "dev": true,
       "requires": {
-        "es6-promise": "4.2.2",
+        "es6-promise": "4.2.4",
         "extract-zip": "1.6.6",
         "fs-extra": "1.0.0",
         "hasha": "2.2.0",
@@ -9634,9 +9674,9 @@
       "integrity": "sha1-DfvC3/lsRRuzMu3Pz6r1ZtMx1bM="
     },
     "postcss": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-      "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
+      "version": "6.0.17",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz",
+      "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==",
       "dev": true,
       "requires": {
         "chalk": "2.3.0",
@@ -9700,7 +9740,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -9767,7 +9807,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -9833,7 +9873,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -9898,7 +9938,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -9963,7 +10003,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10028,7 +10068,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10093,7 +10133,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10159,7 +10199,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10225,7 +10265,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10324,7 +10364,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10389,7 +10429,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10430,8 +10470,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000793",
-            "electron-to-chromium": "1.3.31"
+            "caniuse-db": "1.0.30000800",
+            "electron-to-chromium": "1.3.32"
           }
         },
         "chalk": {
@@ -10468,7 +10508,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10541,7 +10581,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10607,7 +10647,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10675,7 +10715,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10743,7 +10783,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10771,7 +10811,7 @@
       "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.16"
+        "postcss": "6.0.17"
       }
     },
     "postcss-modules-local-by-default": {
@@ -10781,7 +10821,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.16"
+        "postcss": "6.0.17"
       }
     },
     "postcss-modules-scope": {
@@ -10791,7 +10831,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.16"
+        "postcss": "6.0.17"
       }
     },
     "postcss-modules-values": {
@@ -10801,7 +10841,7 @@
       "dev": true,
       "requires": {
         "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.16"
+        "postcss": "6.0.17"
       }
     },
     "postcss-normalize-charset": {
@@ -10847,7 +10887,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10915,7 +10955,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -10981,7 +11021,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -11047,7 +11087,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -11112,7 +11152,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -11179,7 +11219,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -11258,7 +11298,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -11325,7 +11365,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -11398,7 +11438,7 @@
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.4.1",
+            "js-base64": "2.4.3",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
           }
@@ -11561,13 +11601,13 @@
       "requires": {
         "duplexify": "3.5.3",
         "inherits": "2.0.3",
-        "pump": "2.0.0"
+        "pump": "2.0.1"
       },
       "dependencies": {
         "pump": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.0.tgz",
-          "integrity": "sha512-6MYypjOvtiXhBSTOD0Zs5eNjCGfnqi5mPsCsW+dgKTxrZzQMZQNpBo3XRkLx7id753f3EeyHLBqzqqUymIolgw==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "dev": true,
           "requires": {
             "end-of-stream": "1.4.1",
@@ -12310,7 +12350,7 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "2.4.1",
+        "js-base64": "2.4.3",
         "source-map": "0.4.4"
       },
       "dependencies": {
@@ -12346,7 +12386,7 @@
         "debug": "2.6.9",
         "depd": "1.1.2",
         "destroy": "1.0.4",
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
         "fresh": "0.5.2",
@@ -12370,7 +12410,7 @@
       "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
       "dev": true,
       "requires": {
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "parseurl": "1.3.2",
         "send": "0.16.1"
@@ -12401,9 +12441,9 @@
       "dev": true
     },
     "sha.js": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz",
-      "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==",
+      "version": "2.4.10",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
+      "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -12446,7 +12486,7 @@
       "dev": true,
       "requires": {
         "json-stable-stringify": "0.0.1",
-        "sha.js": "2.4.9"
+        "sha.js": "2.4.10"
       }
     },
     "shebang-command": {
@@ -12477,9 +12517,9 @@
       }
     },
     "shelljs": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.0.tgz",
-      "integrity": "sha512-wb72o5SM27oFRq2mMeNSl70DVkkvwf3ZSgk9rvieRVz7xFMIQp02HYw0oxlZgeAWS+wzGB+jcJWQTF7hH9WIPg==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
+      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
       "dev": true,
       "requires": {
         "glob": "7.1.2",
@@ -12498,18 +12538,18 @@
       "integrity": "sha1-t1vFoNh+UwkowszaVzUnS7JW8jQ="
     },
     "sinon": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.1.6.tgz",
-      "integrity": "sha1-nLNGvdsYDWioBEKf/hSXjX+v1ik=",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.2.2.tgz",
+      "integrity": "sha512-BEa593xl+IkIc94nKo0O0LauQC/gQy8Gyv4DkzPwF/9DweC5phr1y+42zibCpn9abfkdHxt9r8AhD0R6u9DE/Q==",
       "dev": true,
       "requires": {
         "diff": "3.3.1",
         "formatio": "1.2.0",
         "lodash.get": "4.4.2",
-        "lolex": "2.3.1",
-        "nise": "1.2.0",
+        "lolex": "2.3.2",
+        "nise": "1.2.2",
         "supports-color": "5.1.0",
-        "type-detect": "4.0.7"
+        "type-detect": "4.0.8"
       },
       "dependencies": {
         "supports-color": {
@@ -13181,6 +13221,12 @@
         }
       }
     },
+    "tryer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.0.tgz",
+      "integrity": "sha1-Antp+oIyJeVRys4+8DsR9qs3wdc=",
+      "dev": true
+    },
     "tsscmp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
@@ -13189,9 +13235,9 @@
       "optional": true
     },
     "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
       "dev": true
     },
     "tunnel-agent": {
@@ -13220,9 +13266,9 @@
       }
     },
     "type-detect": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz",
-      "integrity": "sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true
     },
     "type-is": {
@@ -13242,9 +13288,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.7.tgz",
-      "integrity": "sha512-esJIpNQIC44EFSrbeFPhiXHy2HJ+dTcnn0Zdkn+5meuLsvoV0mFJffKlyezNIIHNfhF0NpgbifygCfEyAogIhQ==",
+      "version": "3.3.9",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.9.tgz",
+      "integrity": "sha512-J2t8B5tj9JdPTW4+sNZXmiIWHzTvcoITkaqzTiilu/biZF/9crqf/Fi7k5hqbOmVRh9/hVNxAxBYIMF7N6SqMQ==",
       "dev": true,
       "requires": {
         "commander": "2.13.0",
@@ -13401,21 +13447,13 @@
       }
     },
     "useragent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
-      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
       "dev": true,
       "requires": {
-        "lru-cache": "2.2.4",
+        "lru-cache": "4.1.1",
         "tmp": "0.0.33"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
-          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
-          "dev": true
-        }
       }
     },
     "util": {
@@ -13536,24 +13574,36 @@
       "dev": true
     },
     "vue-loader": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.0.tgz",
-      "integrity": "sha512-kDXRgglOOltghngrDFS/YfFew7e0d8fkvPHLYAfLgur7GW0cBt+J0fpBReWY2pixA09dL13abfE4fECyRH4HGg==",
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-14.1.1.tgz",
+      "integrity": "sha512-ZLu0yWohbWPayFhSPy80xnObCrPDLGrf/v9R5kJyUbVlcI46srnQlaG+HnTN5HAt5nV9iJiF4oJIjX0+jK+f0w==",
       "dev": true,
       "requires": {
         "consolidate": "0.14.5",
         "hash-sum": "1.0.2",
         "loader-utils": "1.1.0",
         "lru-cache": "4.1.1",
-        "postcss": "6.0.16",
+        "postcss": "6.0.17",
         "postcss-load-config": "1.2.0",
         "postcss-selector-parser": "2.2.3",
         "prettier": "1.10.2",
         "resolve": "1.5.0",
         "source-map": "0.6.1",
         "vue-hot-reload-api": "2.2.4",
-        "vue-style-loader": "3.0.3",
+        "vue-style-loader": "4.0.1",
         "vue-template-es2015-compiler": "1.6.0"
+      },
+      "dependencies": {
+        "vue-style-loader": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.0.1.tgz",
+          "integrity": "sha512-k21XBqrm13hFt4+ywXP5Jv1T4v31lI7r7dpA4zS5FS2T28MjJc5rq8EG85K2IVjq9FDk8d+IUSD/4stYfG4UZg==",
+          "dev": true,
+          "requires": {
+            "hash-sum": "1.0.2",
+            "loader-utils": "1.1.0"
+          }
+        }
       }
     },
     "vue-router": {
@@ -13562,9 +13612,9 @@
       "integrity": "sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w=="
     },
     "vue-style-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.0.3.tgz",
-      "integrity": "sha512-P/ihpaZKU23T1kq3E0y4c+F8sbm1HQO69EFYoLoGMSGVAHroHsGir/WQ9qUavP8dyFYHmXenzHaJ/nqd8vfaxw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz",
+      "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==",
       "dev": true,
       "requires": {
         "hash-sum": "1.0.2",
@@ -13604,7 +13654,7 @@
       "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==",
       "dev": true,
       "requires": {
-        "acorn": "5.3.0",
+        "acorn": "5.4.1",
         "acorn-dynamic-import": "2.0.2",
         "ajv": "5.5.2",
         "ajv-keywords": "2.1.1",
@@ -13786,36 +13836,30 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz",
-      "integrity": "sha1-Y+2G63HMTNqG9o5oWoRTC6ASZEk=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.10.0.tgz",
+      "integrity": "sha512-eA/9F/ZLFlVXfCLYqefHFbelJ3JcvyeFdmpAG6Vu3iJNcisj3KWNPqu00lCqK9caeaesipVrGb9alUSi2lEvAg==",
       "dev": true,
       "requires": {
-        "acorn": "5.3.0",
-        "chalk": "1.1.3",
-        "commander": "2.12.2",
+        "acorn": "5.4.1",
+        "bfj-node4": "5.2.0",
+        "chalk": "2.3.0",
+        "commander": "2.13.0",
         "ejs": "2.5.7",
         "express": "4.16.2",
         "filesize": "3.5.11",
-        "gzip-size": "3.0.0",
+        "gzip-size": "4.1.0",
         "lodash": "4.17.4",
         "mkdirp": "0.5.1",
         "opener": "1.4.3",
         "ws": "4.0.0"
       },
       "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
         },
         "ws": {
           "version": "4.0.0",
@@ -13872,20 +13916,9 @@
       "dev": true,
       "requires": {
         "chalk": "2.3.0",
-        "log-symbols": "2.1.0",
+        "log-symbols": "2.2.0",
         "loglevelnext": "1.0.3",
         "uuid": "3.2.1"
-      },
-      "dependencies": {
-        "log-symbols": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
-          "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.3.0"
-          }
-        }
       }
     },
     "webpack-merge": {
diff --git a/Vue_Full_Project/package.json b/Vue_Full_Project/package.json
index 53edf026..258cd6da 100644
--- a/Vue_Full_Project/package.json
+++ b/Vue_Full_Project/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@coreui/vue",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
-  "copyright": "Copyright 2017 creativeLabs Łukasz Holeczek",
+  "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "bootstrap": "4.0.0",
-    "bootstrap-vue": "1.4.1",
+    "bootstrap-vue": "2.0.0-rc.1",
     "chart.js": "2.7.1",
     "flag-icon-css": "2.9.0",
     "font-awesome": "^4.7.0",
@@ -40,13 +40,13 @@
     "connect-history-api-fallback": "1.5.0",
     "copy-webpack-plugin": "4.3.1",
     "css-loader": "0.28.9",
-    "eslint": "4.15.0",
+    "eslint": "4.16.0",
     "eslint-friendly-formatter": "3.0.0",
     "eslint-loader": "1.9.0",
-    "eslint-plugin-html": "4.0.1",
+    "eslint-plugin-html": "4.0.2",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-node": "5.2.1",
-    "eslint-config-standard": "10.2.1",
+    "eslint-config-standard": "11.0.0-beta.0",
     "eslint-plugin-promise": "3.6.0",
     "eslint-plugin-standard": "3.0.1",
     "eventsource-polyfill": "0.9.6",
@@ -66,32 +66,32 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "2.0.9",
-    "lolex": "2.3.1",
+    "lolex": "2.3.2",
     "mocha": "5.0.0",
     "chai": "4.1.2",
-    "sinon": "4.1.6",
+    "sinon": "4.2.2",
     "sinon-chai": "2.14.0",
     "inject-loader": "3.0.1",
     "babel-plugin-istanbul": "4.1.5",
     "phantomjs-prebuilt": "^2.1.16",
-    "chromedriver": "2.34.1",
-    "cross-spawn": "5.1.0",
+    "chromedriver": "2.35.0",
+    "cross-spawn": "6.0.4",
     "nightwatch": "0.9.19",
     "node-sass": "4.7.2",
     "sass-loader": "6.0.6",
     "selenium-server": "3.8.1",
     "semver": "5.5.0",
-    "shelljs": "0.8.0",
+    "shelljs": "0.8.1",
     "opn": "5.2.0",
     "optimize-css-assets-webpack-plugin": "3.2.0",
-    "ora": "1.3.0",
+    "ora": "1.4.0",
     "rimraf": "2.6.2",
     "url-loader": "0.6.2",
-    "vue-loader": "13.7.0",
-    "vue-style-loader": "3.0.3",
+    "vue-loader": "14.1.1",
+    "vue-style-loader": "3.1.2",
     "vue-template-compiler": "2.5.13",
     "webpack": "3.10.0",
-    "webpack-bundle-analyzer": "2.9.2",
+    "webpack-bundle-analyzer": "2.10.0",
     "webpack-dev-middleware": "2.0.4",
     "webpack-hot-middleware": "2.21.0",
     "webpack-merge": "4.1.1"
diff --git a/Vue_Full_Project/scss/core/_card.scss b/Vue_Full_Project/scss/core/_card.scss
index 20e57a81..733b9632 100644
--- a/Vue_Full_Project/scss/core/_card.scss
+++ b/Vue_Full_Project/scss/core/_card.scss
@@ -20,7 +20,7 @@
 .card-header {
 
   .icon-bg {
-    display: inline-body;
+    display: inline-block;
     padding: $card-spacer-y $card-spacer-x !important;
     margin-top: -$card-spacer-y;
     margin-right: $card-spacer-x;
@@ -135,12 +135,12 @@
       }
 
       [class^="icon-"], [class*=" icon-"] {
-        display: inline-body;
+        display: inline-block;
         vertical-align: middle;
       }
 
       i {
-        display: inline-body;
+        display: inline-block;
         transition: .4s;
       }
 
@@ -153,7 +153,7 @@
       width: 230px;
       margin: 6px;
 
-      .input-group-addon {
+      .input-group-prepend, .input-group-append {
         background: #fff;
       }
 
diff --git a/Vue_Full_Project/scss/core/_input-group.scss b/Vue_Full_Project/scss/core/_input-group.scss
index 23b25122..c8ce1158 100644
--- a/Vue_Full_Project/scss/core/_input-group.scss
+++ b/Vue_Full_Project/scss/core/_input-group.scss
@@ -1,6 +1,5 @@
-.input-group-addon,
-.input-group-btn {
-  min-width: 40px;
+.input-group-prepend,
+.input-group-append {
   white-space: nowrap;
   vertical-align: middle; // Match the inputs
 }
diff --git a/Vue_Full_Project/scss/style.scss b/Vue_Full_Project/scss/style.scss
index 468386c5..b51308da 100644
--- a/Vue_Full_Project/scss/style.scss
+++ b/Vue_Full_Project/scss/style.scss
@@ -1,6 +1,6 @@
 /*!
  * CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.9
+ * @version v1.0.10
  * @link http://coreui.io
  * Copyright (c) 2018 creativeLabs Łukasz Holeczek
  * @license MIT
diff --git a/Vue_Full_Project/src/views/Dashboard.vue b/Vue_Full_Project/src/views/Dashboard.vue
index 0371bb2c..d8e3d6c1 100644
--- a/Vue_Full_Project/src/views/Dashboard.vue
+++ b/Vue_Full_Project/src/views/Dashboard.vue
@@ -78,7 +78,7 @@
     <b-card>
       <b-row>
         <b-col sm="5">
-          <h4 class="card-title mb-0">Traffic</h4>
+          <h4 id="traffic" class="card-title mb-0">Traffic</h4>
           <div class="small text-muted">November 2017</div>
         </b-col>
         <b-col sm="7" class="d-none d-md-block">
diff --git a/Vue_Full_Project/src/views/base/Breadcrumbs.vue b/Vue_Full_Project/src/views/base/Breadcrumbs.vue
index 9901a494..69c1d81f 100644
--- a/Vue_Full_Project/src/views/base/Breadcrumbs.vue
+++ b/Vue_Full_Project/src/views/base/Breadcrumbs.vue
@@ -7,9 +7,9 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap Breadcrumb</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap Breadcrumb</strong>
               <div class="card-actions">
-                <a href="https://bootstrap-vue.js.org/docs/components/breadcrumb" target="_blank"><small className="text-muted">docs</small></a>
+                <a href="https://bootstrap-vue.js.org/docs/components/breadcrumb" target="_blank"><small class="text-muted">docs</small></a>
               </div>
             </div>
             <b-breadcrumb :items="items"/>
diff --git a/Vue_Full_Project/src/views/base/Carousels.vue b/Vue_Full_Project/src/views/base/Carousels.vue
index 90c41948..240eb62c 100644
--- a/Vue_Full_Project/src/views/base/Carousels.vue
+++ b/Vue_Full_Project/src/views/base/Carousels.vue
@@ -7,9 +7,9 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap Carousel</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap Carousel</strong>
               <div class="card-actions">
-                <a href="https://bootstrap-vue.js.org/docs/components/carousel" target="_blank"><small className="text-muted">docs</small></a>
+                <a href="https://bootstrap-vue.js.org/docs/components/carousel" target="_blank"><small class="text-muted">docs</small></a>
               </div>
             </div>
             <div>
diff --git a/Vue_Full_Project/src/views/base/Collapses.vue b/Vue_Full_Project/src/views/base/Collapses.vue
index 0642b230..b15cab21 100644
--- a/Vue_Full_Project/src/views/base/Collapses.vue
+++ b/Vue_Full_Project/src/views/base/Collapses.vue
@@ -7,9 +7,9 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap Collapse</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap Collapse</strong>
               <div class="card-actions">
-                <a href="https://bootstrap-vue.js.org/docs/components/collapse" target="_blank"><small className="text-muted">docs</small></a>
+                <a href="https://bootstrap-vue.js.org/docs/components/collapse" target="_blank"><small class="text-muted">docs</small></a>
               </div>
             </div>
             <div>
@@ -31,7 +31,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Collapse</strong> <small>with<code>v-b-toggle</code>directive</small>
+              <i class="fa fa-align-justify"></i> <strong>Collapse</strong> <small>with<code>v-b-toggle</code>directive</small>
             </div>
             <div>
               <!-- Using modifiers -->
@@ -56,7 +56,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Collapse</strong> <small>with<code>visibility</code></small>
+              <i class="fa fa-align-justify"></i> <strong>Collapse</strong> <small>with<code>visibility</code></small>
             </div>
             <div>
               <b-btn v-b-toggle.collapse3 class="m-1">Toggle Collapse</b-btn>
@@ -73,7 +73,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Collapse</strong> <small>with<code>v-model</code></small>
+              <i class="fa fa-align-justify"></i> <strong>Collapse</strong> <small>with<code>v-model</code></small>
             </div>
             <div>
               <b-btn @click="showCollapse = !showCollapse"
@@ -97,7 +97,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Collapse</strong> <small>multiple elements</small>
+              <i class="fa fa-align-justify"></i> <strong>Collapse</strong> <small>multiple elements</small>
             </div>
             <div>
               <!-- Single button triggers two b-collapse components -->
@@ -122,7 +122,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Collapse</strong><small><code>accordion</code>support</small>
+              <i class="fa fa-align-justify"></i> <strong>Collapse</strong><small><code>accordion</code>support</small>
             </div>
             <div role="tablist">
               <b-card no-body class="mb-1">
diff --git a/Vue_Full_Project/src/views/base/Forms.vue b/Vue_Full_Project/src/views/base/Forms.vue
index c6f335ab..3eb21f8b 100644
--- a/Vue_Full_Project/src/views/base/Forms.vue
+++ b/Vue_Full_Project/src/views/base/Forms.vue
@@ -601,25 +601,25 @@
           </div>
           <b-form-group>
             <b-input-group>
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
-              </div>
+              <b-input-group-prepend>
+                <b-input-group-text><i class="fa fa-user"></i></b-input-group-text>
+              </b-input-group-prepend>
               <b-form-input type="text" placeholder="Username"></b-form-input>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
               <b-form-input type="email" placeholder="Email"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text"><i class="fa fa-envelope-o"></i></span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text><i class="fa fa-envelope-o"></i></b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-euro"></i></span>
-              </div>
+              <b-input-group-prepend>
+                <b-input-group-text><i class="fa fa-euro"></i></b-input-group-text>
+              </b-input-group-prepend>
               <b-form-input type="text" placeholder="ex. $1.000.000"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text">.00</span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text>.00</b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <div slot="footer">
@@ -636,11 +636,11 @@
           <b-form-group>
             <b-input-group>
               <!-- Attach Left button -->
-              <b-input-group-button class="input-group-prepend" slot="left">
+              <b-input-group-prepend>
                 <b-button variant="primary">
                   <i class="fa fa-search"></i> Search
                 </b-button>
-              </b-input-group-button>
+              </b-input-group-prepend>
               <b-form-input type="text" placeholder="Username"></b-form-input>
             </b-input-group>
           </b-form-group>
@@ -648,22 +648,22 @@
             <b-input-group>
               <b-form-input type="email" placeholder="Email"></b-form-input>
               <!-- Attach Right button -->
-              <b-input-group-button class="input-group-append" slot="right">
+              <b-input-group-append>
                 <b-button variant="primary">Submit</b-button>
-              </b-input-group-button>
+              </b-input-group-append>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
               <!-- Attach Left button -->
-              <div class="input-group-prepend">
+              <b-input-group-prepend>
                 <b-button variant="primary"><i class="fa fa-facebook"></i></b-button>
-              </div>
+              </b-input-group-prepend>
               <b-form-input type="email" placeholder="Email"></b-form-input>
               <!-- Attach Left button -->
-              <b-input-group-button class="input-group-append" slot="right">
+              <b-input-group-append>
                 <b-button variant="primary"><i class="fa fa-twitter"></i></b-button>
-              </b-input-group-button>
+              </b-input-group-append>
             </b-input-group>
           </b-form-group>
           <div slot="footer">
@@ -680,14 +680,14 @@
           <b-form-group>
               <b-input-group>
                 <!-- Attach Left button -->
-                <b-input-group-button class="input-group-prepend" slot="left">
+                <b-input-group-prepend>
                   <b-dropdown text="Action" variant="primary">
                     <b-dropdown-item>Action</b-dropdown-item>
                     <b-dropdown-item>Another action</b-dropdown-item>
                     <b-dropdown-item>Something else here...</b-dropdown-item>
                     <b-dropdown-item disabled>Disabled action</b-dropdown-item>
                   </b-dropdown>
-                </b-input-group-button>
+                </b-input-group-prepend>
                 <b-form-input placeholder="Username"></b-form-input>
               </b-input-group>
           </b-form-group>
@@ -695,37 +695,37 @@
               <b-input-group>
                 <b-form-input placeholder="Email"></b-form-input>
                 <!-- Attach Right button -->
-                <b-input-group-button class="input-group-append" slot="right">
+                <b-input-group-append>
                   <b-dropdown text="Action" variant="primary" right>
                     <b-dropdown-item>Action</b-dropdown-item>
                     <b-dropdown-item>Another action</b-dropdown-item>
                     <b-dropdown-item>Something else here...</b-dropdown-item>
                     <b-dropdown-item disabled>Disabled action</b-dropdown-item>
                   </b-dropdown>
-                </b-input-group-button>
+                </b-input-group-append>
               </b-input-group>
           </b-form-group>
           <b-form-group>
               <b-input-group>
                 <!-- Attach Left button -->
-                <b-input-group-button class="input-group-prepend" slot="left">
+                <b-input-group-prepend>
                   <b-dropdown text="Split" variant="primary" split>
                     <b-dropdown-item href="#">Action</b-dropdown-item>
                     <b-dropdown-item href="#">Another action</b-dropdown-item>
                     <b-dropdown-item href="#">Something else here...</b-dropdown-item>
                     <b-dropdown-item disabled>Disabled action</b-dropdown-item>
                   </b-dropdown>
-                </b-input-group-button>
+                </b-input-group-prepend>
                 <b-form-input placeholder="..."></b-form-input>
                 <!-- Attach Right button -->
-                <b-input-group-button class="input-group-append" slot="right">
+                <b-input-group-append>
                   <b-dropdown text="Action" variant="primary" right>
                     <b-dropdown-item>Action</b-dropdown-item>
                     <b-dropdown-item>Another action</b-dropdown-item>
                     <b-dropdown-item>Something else here...</b-dropdown-item>
                     <b-dropdown-item disabled>Disabled action</b-dropdown-item>
                   </b-dropdown>
-                </b-input-group-button>
+                </b-input-group-append>
               </b-input-group>
           </b-form-group>
           <div slot="footer">
@@ -853,23 +853,23 @@
           </div>
           <b-form-group>
             <b-input-group>
-              <b-input-group-addon class="input-group-prepend"><span class="input-group-text">Username</span></b-input-group-addon>
+              <b-input-group-prepend><b-input-group-text>Username</b-input-group-text></b-input-group-prepend>
               <b-form-input type="text"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text"><i class="fa fa-user"></i></span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text><i class="fa fa-user"></i></b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
-              <b-input-group-addon class="input-group-prepend"><span class="input-group-text">Email</span></b-input-group-addon>
+              <b-input-group-prepend><b-input-group-text>Email</b-input-group-text></b-input-group-prepend>
               <b-form-input type="email"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text"><i class="fa fa-envelope"></i></span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text><i class="fa fa-envelope"></i></b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
-              <b-input-group-addon class="input-group-prepend"><span class="input-group-text">Password</span></b-input-group-addon>
+              <b-input-group-prepend><b-input-group-text>Password</b-input-group-text></b-input-group-prepend>
               <b-form-input type="password"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text"><i class="fa fa-asterisk"></i></span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text><i class="fa fa-asterisk"></i></b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <div class="form-group form-actions">
@@ -885,19 +885,19 @@
           <b-form-group>
             <b-input-group>
               <b-form-input type="text" placeholder="Username"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text"><i class="fa fa-user"></i></span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text><i class="fa fa-user"></i></b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
               <b-form-input type="email" placeholder="Email"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text"><i class="fa fa-envelope"></i></span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text><i class="fa fa-envelope"></i></b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
               <b-form-input type="password" placeholder="Password"></b-form-input>
-              <b-input-group-addon class="input-group-append"><span class="input-group-text"><i class="fa fa-asterisk"></i></span></b-input-group-addon>
+              <b-input-group-append><b-input-group-text><i class="fa fa-asterisk"></i></b-input-group-text></b-input-group-append>
             </b-input-group>
           </b-form-group>
           <div class="form-group form-actions">
@@ -912,25 +912,25 @@
           </div>
           <b-form-group>
             <b-input-group>
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
-              </div>
+              <b-input-group-prepend>
+                <b-input-group-text><i class="fa fa-user"></i></b-input-group-text>
+              </b-input-group-prepend>
               <b-form-input type="text" placeholder="Username"></b-form-input>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-envelope"></i></span>
-              </div>
+              <b-input-group-prepend>
+                <b-input-group-text><i class="fa fa-envelope"></i></b-input-group-text>
+              </b-input-group-prepend>
               <b-form-input type="email" placeholder="Email"></b-form-input>
             </b-input-group>
           </b-form-group>
           <b-form-group>
             <b-input-group>
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-asterisk"></i></span>
-              </div>
+              <b-input-group-prepend>
+                <b-input-group-text><i class="fa fa-asterisk"></i></b-input-group-text>
+              </b-input-group-prepend>
               <b-form-input type="password" placeholder="Password"></b-form-input>
             </b-input-group>
           </b-form-group>
@@ -955,42 +955,42 @@
             <b-card-body>
               <b-form-group label="Prepended text" label-for="elementsEmail" description="Here's some help text">
                 <b-input-group>
-                  <div class="input-group-prepend">
-                    <span class="input-group-text">@</span>
-                  </div>
+                  <b-input-group-prepend>
+                    <b-input-group-text>@</b-input-group-text>
+                  </b-input-group-prepend>
                   <b-form-input id="elementsEmail" type="email"></b-form-input>
                 </b-input-group>
               </b-form-group>
               <b-form-group label="Appended text" label-for="elementsAppend" description="Here's some help text">
                 <b-input-group>
                   <b-form-input id="elementsAppend" type="text"></b-form-input>
-                  <b-input-group-addon class="input-group-append"><span class="input-group-text">.00</span></b-input-group-addon>
+                  <b-input-group-append><b-input-group-text>.00</b-input-group-text></b-input-group-append>
                 </b-input-group>
               </b-form-group>
               <b-form-group label="Append and prepend" label-for="elementsPrependAppend" description="Here's some help text">
                 <b-input-group>
-                  <div class="input-group-prepend">
-                    <span class="input-group-text">$</span>
-                  </div>
+                  <b-input-group-prepend>
+                    <b-input-group-text>$</b-input-group-text>
+                  </b-input-group-prepend>
                   <b-form-input id="elementsPrependAppend" type="text"></b-form-input>
-                  <b-input-group-addon class="input-group-append"><span class="input-group-text">.00</span></b-input-group-addon>
+                  <b-input-group-append><b-input-group-text>.00</b-input-group-text></b-input-group-append>
                 </b-input-group>
               </b-form-group>
               <b-form-group label="Append with button" label-for="elementsAppendButton" description="Here's some help text">
                 <b-input-group>
                   <b-form-input id="elementsAppendButton" type="text"></b-form-input>
-                  <b-input-group-button class="input-group-append">
+                  <b-input-group-append>
                     <b-button variant="primary">Go!</b-button>
-                  </b-input-group-button>
+                  </b-input-group-append>
                 </b-input-group>
               </b-form-group>
               <b-form-group label="Two-buttons append" label-for="elementsTwoButtons">
                 <b-input-group>
                   <b-form-input id="elementsTwoButtons" type="text"></b-form-input>
-                  <div class="input-group-append">
+                  <b-input-group-append>
                     <b-button variant="primary">Search</b-button>
                     <b-button variant="danger">Options</b-button>
-                  </div>
+                  </b-input-group-append>
                 </b-input-group>
               </b-form-group>
               <div class="form-actions">
diff --git a/Vue_Full_Project/src/views/base/Jumbotrons.vue b/Vue_Full_Project/src/views/base/Jumbotrons.vue
index 2fbe7b71..562ed01d 100644
--- a/Vue_Full_Project/src/views/base/Jumbotrons.vue
+++ b/Vue_Full_Project/src/views/base/Jumbotrons.vue
@@ -5,10 +5,10 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Jumbotron</strong>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Jumbotron</strong>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/jumbotron" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
@@ -23,7 +23,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Jumbotron</strong>
+          <i class="fa fa-align-justify"></i> <strong>Jumbotron</strong>
           <small>with slots</small>
         </div>
         <div>
@@ -49,7 +49,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Jumbotron</strong>
+          <i class="fa fa-align-justify"></i> <strong>Jumbotron</strong>
           <small>variants</small>
         </div>
         <div>
diff --git a/Vue_Full_Project/src/views/base/ListGroups.vue b/Vue_Full_Project/src/views/base/ListGroups.vue
index 2af72eb4..147207d4 100644
--- a/Vue_Full_Project/src/views/base/ListGroups.vue
+++ b/Vue_Full_Project/src/views/base/ListGroups.vue
@@ -7,10 +7,10 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap list group</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap list group</strong>
               <div class="card-actions">
                 <a href="https://bootstrap-vue.js.org/docs/components/list-group" target="_blank">
-                  <small className="text-muted">docs</small>
+                  <small class="text-muted">docs</small>
                 </a>
               </div>
             </div>
@@ -28,7 +28,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>active items</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>active items</small>
             </div>
             <b-list-group>
               <b-list-group-item>Cras justo odio</b-list-group-item>
@@ -46,7 +46,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>disabled items</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>disabled items</small>
             </div>
             <b-list-group>
               <b-list-group-item disabled>Cras justo odio</b-list-group-item>
@@ -62,7 +62,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>actionable items</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>actionable items</small>
             </div>
             <b-list-group>
               <b-list-group-item href="#some-link">Awesome link</b-list-group-item>
@@ -79,7 +79,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>buttons</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>buttons</small>
             </div>
             <b-list-group>
               <b-list-group-item button>Button item</b-list-group-item>
@@ -94,7 +94,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>with badges</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>with badges</small>
             </div>
             <b-list-group>
               <b-list-group-item class="d-flex justify-content-between align-items-center">
@@ -119,7 +119,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>variants</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>variants</small>
             </div>
             <b-list-group>
               <b-list-group-item>This is a default list group item</b-list-group-item>
@@ -139,7 +139,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>variants active</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>variants active</small>
             </div>
             <b-list-group>
               <b-list-group-item href="#">This is a default list group item</b-list-group-item>
@@ -161,7 +161,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>inside cards</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>inside cards</small>
             </div>
             <b-card-group deck>
               <b-card header="<b>Card with list group</b>">
@@ -200,7 +200,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>List group</strong> <small>custom content</small>
+              <i class="fa fa-align-justify"></i> <strong>List group</strong> <small>custom content</small>
             </div>
             <b-list-group>
               <b-list-group-item href="#" active class="flex-column align-items-start">
diff --git a/Vue_Full_Project/src/views/base/Navbars.vue b/Vue_Full_Project/src/views/base/Navbars.vue
index 08eb8490..f5e6ed58 100644
--- a/Vue_Full_Project/src/views/base/Navbars.vue
+++ b/Vue_Full_Project/src/views/base/Navbars.vue
@@ -5,10 +5,10 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navbar</strong>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navbar</strong>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/navbar" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
@@ -57,7 +57,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Navbar</strong>
+          <i class="fa fa-align-justify"></i> <strong>Navbar</strong>
           <small>brand</small>
         </div>
         <div>
@@ -74,7 +74,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Navbar</strong>
+          <i class="fa fa-align-justify"></i> <strong>Navbar</strong>
           <small>text</small>
         </div>
         <div>
@@ -93,7 +93,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Navbar</strong>
+          <i class="fa fa-align-justify"></i> <strong>Navbar</strong>
           <small>dropdown</small>
         </div>
         <div>
@@ -123,7 +123,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Navbar</strong>
+          <i class="fa fa-align-justify"></i> <strong>Navbar</strong>
           <small>form</small>
         </div>
         <div>
@@ -139,7 +139,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Navbar</strong>
+          <i class="fa fa-align-justify"></i> <strong>Navbar</strong>
           <small>input group</small>
         </div>
         <div>
diff --git a/Vue_Full_Project/src/views/base/Navs.vue b/Vue_Full_Project/src/views/base/Navs.vue
index 1a966da9..9654c33d 100644
--- a/Vue_Full_Project/src/views/base/Navs.vue
+++ b/Vue_Full_Project/src/views/base/Navs.vue
@@ -5,10 +5,10 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navs</strong>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navs</strong>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/nav" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
@@ -25,7 +25,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navs</strong> <small>tab style</small>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navs</strong> <small>tab style</small>
         </div>
         <div>
           <b-nav tabs>
@@ -40,7 +40,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navs</strong> <small>pill style</small>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navs</strong> <small>pill style</small>
         </div>
         <div>
           <b-nav pills>
@@ -55,7 +55,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navs</strong> <small>fill tabs</small>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navs</strong> <small>fill tabs</small>
         </div>
         <div>
           <b-nav fill tabs>
@@ -70,7 +70,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navs</strong> <small>justified tabs</small>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navs</strong> <small>justified tabs</small>
         </div>
         <div>
           <b-nav justified tabs>
@@ -85,7 +85,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navs</strong> <small>dropdown support</small>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navs</strong> <small>dropdown support</small>
         </div>
         <div>
           <b-nav pills>
@@ -104,7 +104,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Navs</strong> <small>vertical variation</small>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Navs</strong> <small>vertical variation</small>
         </div>
         <div>
           <b-nav vertical class="w-25">
diff --git a/Vue_Full_Project/src/views/base/Paginations.vue b/Vue_Full_Project/src/views/base/Paginations.vue
index 77910a24..246862a3 100644
--- a/Vue_Full_Project/src/views/base/Paginations.vue
+++ b/Vue_Full_Project/src/views/base/Paginations.vue
@@ -5,10 +5,10 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Pagination</strong>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Pagination</strong>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/pagination" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
@@ -37,7 +37,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Pagination</strong>
+          <i class="fa fa-align-justify"></i> <strong>Pagination</strong>
           <small>alignment</small>
         </div>
         <div>
@@ -63,11 +63,11 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Pagination</strong>
+          <i class="fa fa-align-justify"></i> <strong>Pagination</strong>
           <small>navigation</small>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/pagination" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
diff --git a/Vue_Full_Project/src/views/base/Popovers.vue b/Vue_Full_Project/src/views/base/Popovers.vue
index 29477ab6..33a44b4f 100644
--- a/Vue_Full_Project/src/views/base/Popovers.vue
+++ b/Vue_Full_Project/src/views/base/Popovers.vue
@@ -5,10 +5,10 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Popovers</strong>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Popovers</strong>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/popovers" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
@@ -35,7 +35,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Popovers</strong>
+          <i class="fa fa-align-justify"></i> <strong>Popovers</strong>
           <small>placement</small>
         </div>
         <div class="my-3">
@@ -59,7 +59,7 @@
               header-tag="header"
               footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Popovers</strong>
+          <i class="fa fa-align-justify"></i> <strong>Popovers</strong>
           <small>via properties or slots</small>
         </div>
         <b-row>
@@ -86,7 +86,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Popovers</strong>
+          <i class="fa fa-align-justify"></i> <strong>Popovers</strong>
           <small>show</small>
         </div>
         <div class="d-flex flex-column text-md-center">
@@ -106,7 +106,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Popover</strong>
+          <i class="fa fa-align-justify"></i> <strong>Popover</strong>
           <small>open/close events</small>
         </div>
         <div class="d-flex flex-column text-md-center">
@@ -127,7 +127,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Popover</strong>
+          <i class="fa fa-align-justify"></i> <strong>Popover</strong>
           <small>enable/disable events</small>
         </div>
         <div class="d-flex flex-column text-md-center">
@@ -148,7 +148,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Popover</strong><small><code>v-b-popover</code>directive</small>
+          <i class="fa fa-align-justify"></i> <strong>Popover</strong><small><code>v-b-popover</code>directive</small>
         </div>
         <b-row>
           <b-col md="3" class="py-3 text-center">
diff --git a/Vue_Full_Project/src/views/base/ProgressBars.vue b/Vue_Full_Project/src/views/base/ProgressBars.vue
index f89774bf..d6e884ba 100644
--- a/Vue_Full_Project/src/views/base/ProgressBars.vue
+++ b/Vue_Full_Project/src/views/base/ProgressBars.vue
@@ -5,10 +5,10 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Progress</strong>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Progress</strong>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/progress" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
@@ -26,7 +26,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Progress</strong> <small>labels</small>
+          <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>labels</small>
         </div>
         <div>
           <h5>No label</h5>
@@ -45,7 +45,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Progress</strong> <small>width</small>
+          <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>width</small>
         </div>
         <div>
           <h5>Default width</h5>
@@ -60,7 +60,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Progress</strong> <small>height</small>
+          <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>height</small>
         </div>
         <div>
           <h5>Default height</h5>
@@ -75,7 +75,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Progress</strong> <small>variants</small>
+          <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>variants</small>
         </div>
         <div>
           <div v-for="bar in bars" class="row mb-1">
@@ -93,7 +93,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Progress</strong> <small>striped</small>
+          <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>striped</small>
         </div>
         <div>
           <b-progress :value="25" variant="success" :striped="striped" class="mb-2"></b-progress>
@@ -109,7 +109,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Progress</strong> <small>animated</small>
+          <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>animated</small>
         </div>
         <div>
           <b-progress :value="25" variant="success" striped :animated="animate" class="mb-2"></b-progress>
@@ -125,7 +125,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Progress</strong> <small>multiple bars</small>
+          <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>multiple bars</small>
         </div>
         <div>
           <b-progress :max="max3" class="mb-3">
diff --git a/Vue_Full_Project/src/views/base/Tooltips.vue b/Vue_Full_Project/src/views/base/Tooltips.vue
index 4e3893f3..3add0d3b 100644
--- a/Vue_Full_Project/src/views/base/Tooltips.vue
+++ b/Vue_Full_Project/src/views/base/Tooltips.vue
@@ -5,10 +5,10 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Bootstrap Tooltips</strong><small><code>v-b-tooltip</code>directive</small>
+          <i class="fa fa-align-justify"></i> <strong>Bootstrap Tooltips</strong><small><code>v-b-tooltip</code>directive</small>
           <div class="card-actions">
             <a href="https://bootstrap-vue.js.org/docs/components/tooltip" target="_blank">
-              <small className="text-muted">docs</small>
+              <small class="text-muted">docs</small>
             </a>
           </div>
         </div>
@@ -32,7 +32,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Tooltips</strong><small><code>b-tooltip</code>component</small>
+          <i class="fa fa-align-justify"></i> <strong>Tooltips</strong><small><code>b-tooltip</code>component</small>
         </div>
         <b-row>
           <b-col md="6" class="py-4 text-center">
@@ -55,7 +55,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Tooltips</strong><small><code>show</code>prop</small>
+          <i class="fa fa-align-justify"></i> <strong>Tooltips</strong><small><code>show</code>prop</small>
         </div>
         <div class="text-center">
           <b-btn id="tooltipButton-1" variant="primary">I have a tooltip</b-btn>
@@ -71,7 +71,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Tooltips</strong><small><code>open close</code>events</small>
+          <i class="fa fa-align-justify"></i> <strong>Tooltips</strong><small><code>open close</code>events</small>
         </div>
         <div class="d-flex flex-column text-md-center">
           <div class="p-2">
@@ -91,7 +91,7 @@
         header-tag="header"
         footer-tag="footer">
         <div slot="header">
-          <i className="fa fa-align-justify"></i><strong>Tooltips</strong><small><code>enable disable</code>events</small>
+          <i class="fa fa-align-justify"></i> <strong>Tooltips</strong><small><code>enable disable</code>events</small>
         </div>
         <div class="d-flex flex-column text-md-center">
           <div class="p-2">
diff --git a/Vue_Full_Project/src/views/buttons/ButtonGroups.vue b/Vue_Full_Project/src/views/buttons/ButtonGroups.vue
index 0997bdab..d0bd7296 100644
--- a/Vue_Full_Project/src/views/buttons/ButtonGroups.vue
+++ b/Vue_Full_Project/src/views/buttons/ButtonGroups.vue
@@ -7,10 +7,10 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap button group</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap button group</strong>
               <div class="card-actions">
                 <a href="https://bootstrap-vue.js.org/docs/components/button-group" target="_blank">
-                  <small className="text-muted">docs</small>
+                  <small class="text-muted">docs</small>
                 </a>
               </div>
             </div>
@@ -39,7 +39,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Button group</strong> sizing
+              <i class="fa fa-align-justify"></i> <strong>Button group</strong> sizing
             </div>
             <div>
               <b-button-group>
@@ -67,7 +67,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Button group</strong> dropdown support
+              <i class="fa fa-align-justify"></i> <strong>Button group</strong> dropdown support
             </div>
             <div>
               <b-button-group>
@@ -95,7 +95,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Button group</strong> vertical variation
+              <i class="fa fa-align-justify"></i> <strong>Button group</strong> vertical variation
             </div>
             <div>
               <b-button-group vertical>
@@ -111,10 +111,10 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Button toolbar</strong> <small>with button groups</small>
+              <i class="fa fa-align-justify"></i> <strong>Button toolbar</strong> <small>with button groups</small>
                 <div class="card-actions">
                   <a href="https://bootstrap-vue.js.org/docs/components/button-toolbar" target="_blank">
-                    <small className="text-muted">docs</small>
+                    <small class="text-muted">docs</small>
                   </a>
                 </div>
             </div>
@@ -143,18 +143,18 @@
                   <b-btn>Edit</b-btn>
                 </b-button-group>
                 <b-input-group size="sm" class="w-25 mx-1">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text">$</span>
-                  </div>
+                  <b-input-group-prepend>
+                    <b-input-group-text>$</b-input-group-text>
+                  </b-input-group-prepend>
                   <b-form-input value="100" class="text-right"></b-form-input>
-                  <div class="input-group-append">
-                    <span class="input-group-text">.00</span>
-                  </div>
+                  <b-input-group-append>
+                    <b-input-group-text>.00</b-input-group-text>
+                  </b-input-group-append>
                 </b-input-group>
                 <b-input-group  size="sm" class="w-25 mx-1">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text">Size</span>
-                  </div>
+                  <b-input-group-prepend>
+                    <b-input-group-text>Size</b-input-group-text>
+                  </b-input-group-prepend>
                   <b-form-select value="Medium" :options="['Large','Medium','Small']"></b-form-select>
                 </b-input-group>
                 <b-button-group  size="sm" class="mx-1">
diff --git a/Vue_Full_Project/src/views/buttons/Dropdowns.vue b/Vue_Full_Project/src/views/buttons/Dropdowns.vue
index c873ea51..d10bc681 100644
--- a/Vue_Full_Project/src/views/buttons/Dropdowns.vue
+++ b/Vue_Full_Project/src/views/buttons/Dropdowns.vue
@@ -7,9 +7,9 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap Dropdown</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap Dropdown</strong>
               <div class="card-actions">
-                <a href="https://bootstrap-vue.js.org/docs/components/dropdown" target="_blank"><small className="text-muted">docs</small></a>
+                <a href="https://bootstrap-vue.js.org/docs/components/dropdown" target="_blank"><small class="text-muted">docs</small></a>
               </div>
             </div>
             <div>
@@ -52,7 +52,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Dropdown</strong> <small>positioning</small>
+              <i class="fa fa-align-justify"></i> <strong>Dropdown</strong> <small>positioning</small>
             </div>
             <div>
               <b-dropdown id="ddown-left" text="Left align" variant="primary" class="m-2">
@@ -96,7 +96,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Dropdown</strong> <small>hidden caret</small>
+              <i class="fa fa-align-justify"></i> <strong>Dropdown</strong> <small>hidden caret</small>
             </div>
             <div>
               <b-dropdown variant="link" size="lg" no-caret>
@@ -116,7 +116,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Dropdown</strong> <small>sizing</small>
+              <i class="fa fa-align-justify"></i> <strong>Dropdown</strong> <small>sizing</small>
             </div>
             <div>
               <b-dropdown id="ddown-lg" size="lg" text="Large" class="m-2">
@@ -150,7 +150,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Dropdown</strong> <small>headers and accessibility</small>
+              <i class="fa fa-align-justify"></i> <strong>Dropdown</strong> <small>headers and accessibility</small>
             </div>
             <div>
               <b-dropdown id="ddown-aria" text="Dropdown ARIA" variant="primary" class="m-2">
@@ -175,7 +175,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Dropdown</strong><small><code>variant</code></small>
+              <i class="fa fa-align-justify"></i> <strong>Dropdown</strong><small><code>variant</code></small>
             </div>
             <b-dropdown size="sm" id="ddown_primary" text="Primary" variant="primary" class="m-0">
               <b-dropdown-item>First Action</b-dropdown-item>
diff --git a/Vue_Full_Project/src/views/notifications/Alerts.vue b/Vue_Full_Project/src/views/notifications/Alerts.vue
index cf265986..c96792af 100644
--- a/Vue_Full_Project/src/views/notifications/Alerts.vue
+++ b/Vue_Full_Project/src/views/notifications/Alerts.vue
@@ -7,10 +7,10 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap Alert</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap Alert</strong>
               <div class="card-actions">
                 <a href="https://bootstrap-vue.js.org/docs/components/alert" target="_blank">
-                  <small className="text-muted">docs</small>
+                  <small class="text-muted">docs</small>
                 </a>
               </div>
             </div>
@@ -31,7 +31,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i> Alert
+              <i class="fa fa-align-justify"></i> Alert
               <small> use <code>.alert-link</code> to provide links</small>
             </div>
             <div>
@@ -69,7 +69,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i>Alerts</strong>
+              <i class="fa fa-align-justify"></i>Alerts</strong>
               <small>with additional content</small>
             </div>
             <b-alert show variant="success">
@@ -91,7 +91,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i>Alerts</strong>
+              <i class="fa fa-align-justify"></i>Alerts</strong>
               <small>dismissible</small>
             </div>
             <div>
@@ -113,7 +113,7 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i>Alerts</strong>
+              <i class="fa fa-align-justify"></i>Alerts</strong>
               <small>auto dismissible</small>
             </div>
             <div>
diff --git a/Vue_Full_Project/src/views/notifications/Badges.vue b/Vue_Full_Project/src/views/notifications/Badges.vue
index 5dc190d8..a79842ad 100644
--- a/Vue_Full_Project/src/views/notifications/Badges.vue
+++ b/Vue_Full_Project/src/views/notifications/Badges.vue
@@ -7,9 +7,9 @@
             header-tag="header"
             footer-tag="footer">
             <div slot="header">
-              <i className="fa fa-align-justify"></i><strong>Bootstrap Badge</strong>
+              <i class="fa fa-align-justify"></i> <strong>Bootstrap Badge</strong>
               <div class="card-actions">
-                <a href="https://bootstrap-vue.js.org/docs/components/badge" target="_blank"><small className="text-muted">docs</small></a>
+                <a href="https://bootstrap-vue.js.org/docs/components/badge" target="_blank"><small class="text-muted">docs</small></a>
               </div>
             </div>
             <div>
diff --git a/Vue_Full_Project/src/views/pages/Login.vue b/Vue_Full_Project/src/views/pages/Login.vue
index fca0e2d1..9834fbaf 100644
--- a/Vue_Full_Project/src/views/pages/Login.vue
+++ b/Vue_Full_Project/src/views/pages/Login.vue
@@ -9,11 +9,11 @@
                 <h1>Login</h1>
                 <p class="text-muted">Sign In to your account</p>
                 <b-input-group class="mb-3">
-                  <div class="input-group-prepend"><span class="input-group-text"><i class="icon-user"></i></span></div>
+                  <b-input-group-prepend><b-input-group-text><i class="icon-user"></i></b-input-group-text></b-input-group-prepend>
                   <input type="text" class="form-control" placeholder="Username">
                 </b-input-group>
                 <b-input-group class="mb-4">
-                  <div class="input-group-prepend"><span class="input-group-text"><i class="icon-lock"></i></span></div>
+                  <b-input-group-prepend><b-input-group-text><i class="icon-lock"></i></b-input-group-text></b-input-group-prepend>
                   <input type="password" class="form-control" placeholder="Password">
                 </b-input-group>
                 <b-row>
diff --git a/Vue_Full_Project/src/views/pages/Page404.vue b/Vue_Full_Project/src/views/pages/Page404.vue
index 2c77ff7a..6f1ece56 100644
--- a/Vue_Full_Project/src/views/pages/Page404.vue
+++ b/Vue_Full_Project/src/views/pages/Page404.vue
@@ -9,15 +9,15 @@
             <p class="text-muted">The page you are looking for was not found.</p>
           </div>
           <b-input-group>
-            <div class="input-group-prepend">
-              <span class="input-group-text">
+            <b-input-group-prepend>
+              <b-input-group-text>
                 <i class="fa fa-search"></i>
-              </span>
-            </div>
+              </b-input-group-text>
+            </b-input-group-prepend>
             <input id="prependedInput" class="form-control" size="16" type="text" placeholder="What are you looking for?">
-            <div class="input-group-append">
+            <b-input-group-append>
               <b-button variant="info">Search</b-button>
-            </div>
+            </b-input-group-append>
           </b-input-group>
         </b-col>
       </b-row>
diff --git a/Vue_Full_Project/src/views/pages/Page500.vue b/Vue_Full_Project/src/views/pages/Page500.vue
index d1f68d75..126f2c55 100644
--- a/Vue_Full_Project/src/views/pages/Page500.vue
+++ b/Vue_Full_Project/src/views/pages/Page500.vue
@@ -9,15 +9,15 @@
             <p class="text-muted">The page you are looking for is temporarily unavailable.</p>
           </div>
           <b-input-group>
-            <div class="input-group-prepend">
-              <span class="input-group-text">
+            <b-input-group-prepend>
+              <b-input-group-text>
                 <i class="fa fa-search"></i>
-              </span>
-            </div>
+              </b-input-group-text>
+            </b-input-group-prepend>
             <input id="prependedInput" class="form-control" size="16" type="text" placeholder="What are you looking for?">
-            <div class="input-group-append">
+            <b-input-group-append>
               <b-button variant="info">Search</b-button>
-            </div>
+            </b-input-group-append>
           </b-input-group>
         </b-col>
       </b-row>
diff --git a/Vue_Full_Project/src/views/pages/Register.vue b/Vue_Full_Project/src/views/pages/Register.vue
index 34d264bf..80f91ff2 100644
--- a/Vue_Full_Project/src/views/pages/Register.vue
+++ b/Vue_Full_Project/src/views/pages/Register.vue
@@ -8,30 +8,30 @@
               <h1>Register</h1>
               <p class="text-muted">Create your account</p>
               <b-input-group class="mb-3">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="icon-user"></i></span>
-                </div>
+                <b-input-group-prepend>
+                  <b-input-group-text><i class="icon-user"></i></b-input-group-text>
+                </b-input-group-prepend>
                 <input type="text" class="form-control" placeholder="Username">
               </b-input-group>
 
               <b-input-group class="mb-3">
-                <div class="input-group-prepend">
-                  <span class="input-group-text">@</span>
-                </div>
+                <b-input-group-prepend>
+                  <b-input-group-text>@</b-input-group-text>
+                </b-input-group-prepend>
                 <input type="text" class="form-control" placeholder="Email">
               </b-input-group>
 
               <b-input-group class="mb-3">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="icon-lock"></i></span>
-                </div>
+                <b-input-group-prepend>
+                  <b-input-group-text><i class="icon-lock"></i></b-input-group-text>
+                </b-input-group-prepend>
                 <input type="password" class="form-control" placeholder="Password">
               </b-input-group>
 
               <b-input-group class="mb-4">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="icon-lock"></i></span>
-                </div>
+                <b-input-group-prepend>
+                  <b-input-group-text><i class="icon-lock"></i></b-input-group-text>
+                </b-input-group-prepend>
                 <input type="password" class="form-control" placeholder="Repeat password">
               </b-input-group>
 
diff --git a/Vue_Full_Project/test/unit/specs/Dashboard.spec.js b/Vue_Full_Project/test/unit/specs/Dashboard.spec.js
new file mode 100644
index 00000000..bdbfacfd
--- /dev/null
+++ b/Vue_Full_Project/test/unit/specs/Dashboard.spec.js
@@ -0,0 +1,22 @@
+import Vue from 'vue'
+import BootstrapVue from 'bootstrap-vue'
+import Dashboard from '@/views/Dashboard'
+
+Vue.use(BootstrapVue)
+
+describe('Dashboard', () => {
+  it('has a created hook', () => {
+    expect(typeof Dashboard.data).to.equal('function')
+  })
+  it('sets the correct default data', () => {
+    expect(typeof Dashboard.data).to.equal('function')
+    const defaultData = Dashboard.data()
+    expect(defaultData.selected).to.equal('Month')
+  })
+  it('should render correct contents', () => {
+    const Constructor = Vue.extend(Dashboard)
+    const vm = new Constructor().$mount()
+    expect(vm.$el.querySelector('#traffic').textContent)
+      .to.equal('Traffic')
+  })
+})
diff --git a/Vue_Full_Project/test/unit/specs/Hello.spec.js b/Vue_Full_Project/test/unit/specs/Hello.spec.js
deleted file mode 100644
index 80140baa..00000000
--- a/Vue_Full_Project/test/unit/specs/Hello.spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Vue from 'vue'
-import Hello from '@/components/Hello'
-
-describe('Hello.vue', () => {
-  it('should render correct contents', () => {
-    const Constructor = Vue.extend(Hello)
-    const vm = new Constructor().$mount()
-    expect(vm.$el.querySelector('.hello h1').textContent)
-      .to.equal('Welcome to Your Vue.js App')
-  })
-})
diff --git a/Vue_Starter/package.json b/Vue_Starter/package.json
index 53edf026..258cd6da 100644
--- a/Vue_Starter/package.json
+++ b/Vue_Starter/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@coreui/vue",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
-  "copyright": "Copyright 2017 creativeLabs Łukasz Holeczek",
+  "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "bootstrap": "4.0.0",
-    "bootstrap-vue": "1.4.1",
+    "bootstrap-vue": "2.0.0-rc.1",
     "chart.js": "2.7.1",
     "flag-icon-css": "2.9.0",
     "font-awesome": "^4.7.0",
@@ -40,13 +40,13 @@
     "connect-history-api-fallback": "1.5.0",
     "copy-webpack-plugin": "4.3.1",
     "css-loader": "0.28.9",
-    "eslint": "4.15.0",
+    "eslint": "4.16.0",
     "eslint-friendly-formatter": "3.0.0",
     "eslint-loader": "1.9.0",
-    "eslint-plugin-html": "4.0.1",
+    "eslint-plugin-html": "4.0.2",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-node": "5.2.1",
-    "eslint-config-standard": "10.2.1",
+    "eslint-config-standard": "11.0.0-beta.0",
     "eslint-plugin-promise": "3.6.0",
     "eslint-plugin-standard": "3.0.1",
     "eventsource-polyfill": "0.9.6",
@@ -66,32 +66,32 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "2.0.9",
-    "lolex": "2.3.1",
+    "lolex": "2.3.2",
     "mocha": "5.0.0",
     "chai": "4.1.2",
-    "sinon": "4.1.6",
+    "sinon": "4.2.2",
     "sinon-chai": "2.14.0",
     "inject-loader": "3.0.1",
     "babel-plugin-istanbul": "4.1.5",
     "phantomjs-prebuilt": "^2.1.16",
-    "chromedriver": "2.34.1",
-    "cross-spawn": "5.1.0",
+    "chromedriver": "2.35.0",
+    "cross-spawn": "6.0.4",
     "nightwatch": "0.9.19",
     "node-sass": "4.7.2",
     "sass-loader": "6.0.6",
     "selenium-server": "3.8.1",
     "semver": "5.5.0",
-    "shelljs": "0.8.0",
+    "shelljs": "0.8.1",
     "opn": "5.2.0",
     "optimize-css-assets-webpack-plugin": "3.2.0",
-    "ora": "1.3.0",
+    "ora": "1.4.0",
     "rimraf": "2.6.2",
     "url-loader": "0.6.2",
-    "vue-loader": "13.7.0",
-    "vue-style-loader": "3.0.3",
+    "vue-loader": "14.1.1",
+    "vue-style-loader": "3.1.2",
     "vue-template-compiler": "2.5.13",
     "webpack": "3.10.0",
-    "webpack-bundle-analyzer": "2.9.2",
+    "webpack-bundle-analyzer": "2.10.0",
     "webpack-dev-middleware": "2.0.4",
     "webpack-hot-middleware": "2.21.0",
     "webpack-merge": "4.1.1"
diff --git a/Vue_Starter/scss/core/_card.scss b/Vue_Starter/scss/core/_card.scss
index 20e57a81..733b9632 100644
--- a/Vue_Starter/scss/core/_card.scss
+++ b/Vue_Starter/scss/core/_card.scss
@@ -20,7 +20,7 @@
 .card-header {
 
   .icon-bg {
-    display: inline-body;
+    display: inline-block;
     padding: $card-spacer-y $card-spacer-x !important;
     margin-top: -$card-spacer-y;
     margin-right: $card-spacer-x;
@@ -135,12 +135,12 @@
       }
 
       [class^="icon-"], [class*=" icon-"] {
-        display: inline-body;
+        display: inline-block;
         vertical-align: middle;
       }
 
       i {
-        display: inline-body;
+        display: inline-block;
         transition: .4s;
       }
 
@@ -153,7 +153,7 @@
       width: 230px;
       margin: 6px;
 
-      .input-group-addon {
+      .input-group-prepend, .input-group-append {
         background: #fff;
       }
 
diff --git a/Vue_Starter/scss/core/_input-group.scss b/Vue_Starter/scss/core/_input-group.scss
index 23b25122..c8ce1158 100644
--- a/Vue_Starter/scss/core/_input-group.scss
+++ b/Vue_Starter/scss/core/_input-group.scss
@@ -1,6 +1,5 @@
-.input-group-addon,
-.input-group-btn {
-  min-width: 40px;
+.input-group-prepend,
+.input-group-append {
   white-space: nowrap;
   vertical-align: middle; // Match the inputs
 }
diff --git a/Vue_Starter/scss/style.scss b/Vue_Starter/scss/style.scss
index 468386c5..b51308da 100644
--- a/Vue_Starter/scss/style.scss
+++ b/Vue_Starter/scss/style.scss
@@ -1,6 +1,6 @@
 /*!
  * CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.9
+ * @version v1.0.10
  * @link http://coreui.io
  * Copyright (c) 2018 creativeLabs Łukasz Holeczek
  * @license MIT
diff --git a/Vue_Starter/test/unit/specs/Hello.spec.js b/Vue_Starter/test/unit/specs/Dashboard.spec.js
similarity index 89%
rename from Vue_Starter/test/unit/specs/Hello.spec.js
rename to Vue_Starter/test/unit/specs/Dashboard.spec.js
index ca3ad740..48728534 100644
--- a/Vue_Starter/test/unit/specs/Hello.spec.js
+++ b/Vue_Starter/test/unit/specs/Dashboard.spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Dashboard from '@/views/Dashboard'
 
-describe('Dashboard.vue', () => {
+describe('Dashboard', () => {
   it('should render correct contents', () => {
     const Constructor = Vue.extend(Dashboard)
     const vm = new Constructor().$mount()