diff --git a/CHANGELOG.md b/CHANGELOG.md
index 841b81e19..d3a96d6e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 ## [angular](./README.md) version `changelog`
 
+###### `v2.0.1`
+- refactor(modals): buttons spacing
+- refactor(brand-buttons): buttons spacing
+- update: `@coreui/coreui` to `2.0.20`
+- update: `@angular/*` to `6.1.10`
+- update: `@angular/cli` to `6.2.6`
+- update: `chart.js` to `2.7.3`
+- update: `flag-icon-css` to `3.2.1`
+- update: `ngx-perfect-scrollbar` to `6.3.1`
+- update: `rxjs` to `6.3.3`
+- update: `rxjs-compat` to `6.3.3`
+- update: `tsickle` to `0.33.0`
+- update: `@types/jasmine` to `2.8.9`
+- update: `@types/jasminewd2` to `2.0.5`
+- update: `@types/node` to `10.12.0`
+- update: `codelyzer` to `4.5.0`
+- update: `karma-coverage-istanbul-reporter` to `2.0.4`
+- update: `protractor` to `5.4.1`
+
 ###### `v2.0.0`
 - fix(dropdowns): dropup misplaced temp fix
 - chore: update `@coreui/icons` to `0.3.0`
diff --git a/package.json b/package.json
index 1286d964c..614dc49bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/coreui-free-angular-admin-template",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "CoreUI Free Angular 2+ Admin Template",
   "author": {
     "name": "Łukasz Holeczek",
@@ -27,52 +27,53 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.1.6",
-    "@angular/common": "^6.1.6",
-    "@angular/compiler": "^6.1.6",
-    "@angular/core": "^6.1.6",
-    "@angular/forms": "^6.1.6",
-    "@angular/http": "^6.1.6",
-    "@angular/platform-browser": "^6.1.6",
-    "@angular/platform-browser-dynamic": "^6.1.6",
-    "@angular/router": "^6.1.6",
+    "@angular/animations": "^6.1.10",
+    "@angular/common": "^6.1.10",
+    "@angular/compiler": "^6.1.10",
+    "@angular/core": "^6.1.10",
+    "@angular/forms": "^6.1.10",
+    "@angular/http": "^6.1.10",
+    "@angular/platform-browser": "^6.1.10",
+    "@angular/platform-browser-dynamic": "^6.1.10",
+    "@angular/router": "^6.1.10",
     "@coreui/angular": "^2.0.0-rc.1",
-    "@coreui/coreui": "^2.0.4",
+    "@coreui/coreui": "^2.0.20",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
     "@coreui/icons": "0.3.0",
     "bootstrap": "^4.1.3",
-    "chart.js": "^2.7.2",
+    "chart.js": "^2.7.3",
     "core-js": "^2.5.7",
-    "flag-icon-css": "^3.0.0",
+    "flag-icon-css": "^3.2.1",
     "font-awesome": "^4.7.0",
     "moment": "^2.22.2",
     "mutationobserver-shim": "^0.3.2",
     "ng2-charts": "^1.6.0",
     "ngx-bootstrap": "^3.0.1",
-    "ngx-perfect-scrollbar": "^6.3.0",
-    "rxjs": "^6.3.0",
-    "rxjs-compat": "^6.3.0",
+    "ngx-perfect-scrollbar": "^6.3.1",
+    "rxjs": "^6.3.3",
+    "rxjs-compat": "^6.3.3",
     "simple-line-icons": "^2.4.1",
     "ts-helpers": "^1.1.2",
+    "tsickle": "^0.33.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.7.5",
-    "@angular/cli": "^6.1.5",
-    "@angular/compiler-cli": "^6.1.6",
-    "@angular/language-service": "^6.1.6",
-    "@types/jasmine": "^2.8.8",
-    "@types/jasminewd2": "^2.0.3",
-    "@types/node": "^10.9.4",
-    "codelyzer": "^4.4.4",
+    "@angular/cli": "^6.2.6",
+    "@angular/compiler-cli": "^6.1.10",
+    "@angular/language-service": "^6.1.10",
+    "@types/jasmine": "^2.8.9",
+    "@types/jasminewd2": "^2.0.5",
+    "@types/node": "^10.12.0",
+    "codelyzer": "^4.5.0",
     "jasmine-core": "^3.2.1",
     "jasmine-spec-reporter": "^4.2.1",
     "karma": "^3.0.0",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage-istanbul-reporter": "^2.0.2",
+    "karma-coverage-istanbul-reporter": "^2.0.4",
     "karma-jasmine": "^1.1.2",
     "karma-jasmine-html-reporter": "^1.3.1",
-    "protractor": "5.4.0",
+    "protractor": "^5.4.1",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
     "typescript": "^2.9.2"
diff --git a/src/app/views/base/forms.component.html b/src/app/views/base/forms.component.html
index 6bcedac8d..1e552e8b6 100644
--- a/src/app/views/base/forms.component.html
+++ b/src/app/views/base/forms.component.html
@@ -140,6 +140,13 @@
                 <span class="help-block">Please enter a complex password</span>
               </div>
             </div>
+            <div class="form-group row">
+              <label class="col-md-3 col-form-label" for="date-input">Date Input</label>
+              <div class="col-md-9">
+                <input class="form-control" id="date-input" type="date" name="date-input" placeholder="date">
+                <span class="help-block">Please enter a valid date</span>
+              </div>
+            </div>
             <div class="form-group row">
               <label class="col-md-3 col-form-label" for="disabled-input">Disabled Input</label>
               <div class="col-md-9">
diff --git a/src/app/views/buttons/brand-buttons.component.html b/src/app/views/buttons/brand-buttons.component.html
index 8084e757a..534b85c8a 100644
--- a/src/app/views/buttons/brand-buttons.component.html
+++ b/src/app/views/buttons/brand-buttons.component.html
@@ -14,206 +14,206 @@ <h6>Size Small
             </small>
           </h6>
           <p>
-            <button type="button" class="btn btn-brand btn-sm btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-facebook mr-1" style="margin-bottom: 4px">
               <i class="fa fa-facebook"></i>
               <span>Facebook</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-twitter mr-1" style="margin-bottom: 4px">
               <i class="fa fa-twitter"></i>
               <span>Twitter</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-linkedin mr-1" style="margin-bottom: 4px">
               <i class="fa fa-linkedin"></i>
               <span>LinkedIn</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-flickr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-flickr"></i>
               <span>Flickr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-tumblr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-tumblr"></i>
               <span>Tumblr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-xing mr-1" style="margin-bottom: 4px">
               <i class="fa fa-xing"></i>
               <span>Xing</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-github mr-1" style="margin-bottom: 4px">
               <i class="fa fa-github"></i>
               <span>Github</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-html5 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-html5"></i>
               <span>HTML5</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-openid mr-1" style="margin-bottom: 4px">
               <i class="fa fa-openid"></i>
               <span>OpenID</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <i class="fa fa-stack-overflow"></i>
               <span>StackOverflow</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-css3 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-css3"></i>
               <span>CSS3</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-youtube mr-1" style="margin-bottom: 4px">
               <i class="fa fa-youtube"></i>
               <span>YouTube</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-dribbble mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dribbble"></i>
               <span>Dribbble</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-google-plus mr-1" style="margin-bottom: 4px">
               <i class="fa fa-google-plus"></i>
               <span>Google+</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-instagram mr-1" style="margin-bottom: 4px">
               <i class="fa fa-instagram"></i>
               <span>Instagram</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-pinterest mr-1" style="margin-bottom: 4px">
               <i class="fa fa-pinterest"></i>
               <span>Pinterest</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vk mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vk"></i>
               <span>VK</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-yahoo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-yahoo"></i>
               <span>Yahoo</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-behance mr-1" style="margin-bottom: 4px">
               <i class="fa fa-behance"></i>
               <span>Behance</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-dropbox mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dropbox"></i>
               <span>Dropbox</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-reddit mr-1" style="margin-bottom: 4px">
               <i class="fa fa-reddit"></i>
               <span>Reddit</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-spotify mr-1" style="margin-bottom: 4px">
               <i class="fa fa-spotify"></i>
               <span>Spotify</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vine mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vine"></i>
               <span>Vine</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-foursquare mr-1" style="margin-bottom: 4px">
               <i class="fa fa-foursquare"></i>
               <span>Forsquare</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vimeo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vimeo"></i>
               <span>Vimeo</span>
             </button>
           </p>
           <h6>Size Normal</h6>
           <p>
-            <button type="button" class="btn btn-brand btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-facebook mr-1" style="margin-bottom: 4px">
               <i class="fa fa-facebook"></i>
               <span>Facebook</span>
             </button>
-            <button type="button" class="btn btn-brand btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-twitter mr-1" style="margin-bottom: 4px">
               <i class="fa fa-twitter"></i>
               <span>Twitter</span>
             </button>
-            <button type="button" class="btn btn-brand btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-linkedin mr-1" style="margin-bottom: 4px">
               <i class="fa fa-linkedin"></i>
               <span>LinkedIn</span>
             </button>
-            <button type="button" class="btn btn-brand btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-flickr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-flickr"></i>
               <span>Flickr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-tumblr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-tumblr"></i>
               <span>Tumblr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-xing mr-1" style="margin-bottom: 4px">
               <i class="fa fa-xing"></i>
               <span>Xing</span>
             </button>
-            <button type="button" class="btn btn-brand btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-github mr-1" style="margin-bottom: 4px">
               <i class="fa fa-github"></i>
               <span>Github</span>
             </button>
-            <button type="button" class="btn btn-brand btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-html5 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-html5"></i>
               <span>HTML5</span>
             </button>
-            <button type="button" class="btn btn-brand btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-openid mr-1" style="margin-bottom: 4px">
               <i class="fa fa-openid"></i>
               <span>OpenID</span>
             </button>
-            <button type="button" class="btn btn-brand btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <i class="fa fa-stack-overflow"></i>
               <span>StackOverflow</span>
             </button>
-            <button type="button" class="btn btn-brand btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-css3 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-css3"></i>
               <span>CSS3</span>
             </button>
-            <button type="button" class="btn btn-brand btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-youtube mr-1" style="margin-bottom: 4px">
               <i class="fa fa-youtube"></i>
               <span>YouTube</span>
             </button>
-            <button type="button" class="btn btn-brand btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-dribbble mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dribbble"></i>
               <span>Dribbble</span>
             </button>
-            <button type="button" class="btn btn-brand btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-google-plus mr-1" style="margin-bottom: 4px">
               <i class="fa fa-google-plus"></i>
               <span>Google+</span>
             </button>
-            <button type="button" class="btn btn-brand btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-instagram mr-1" style="margin-bottom: 4px">
               <i class="fa fa-instagram"></i>
               <span>Instagram</span>
             </button>
-            <button type="button" class="btn btn-brand btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-pinterest mr-1" style="margin-bottom: 4px">
               <i class="fa fa-pinterest"></i>
               <span>Pinterest</span>
             </button>
-            <button type="button" class="btn btn-brand btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vk mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vk"></i>
               <span>VK</span>
             </button>
-            <button type="button" class="btn btn-brand btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-yahoo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-yahoo"></i>
               <span>Yahoo</span>
             </button>
-            <button type="button" class="btn btn-brand btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-behance mr-1" style="margin-bottom: 4px">
               <i class="fa fa-behance"></i>
               <span>Behance</span>
             </button>
-            <button type="button" class="btn btn-brand btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-dropbox mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dropbox"></i>
               <span>Dropbox</span>
             </button>
-            <button type="button" class="btn btn-brand btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-reddit mr-1" style="margin-bottom: 4px">
               <i class="fa fa-reddit"></i>
               <span>Reddit</span>
             </button>
-            <button type="button" class="btn btn-brand btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-spotify mr-1" style="margin-bottom: 4px">
               <i class="fa fa-spotify"></i>
               <span>Spotify</span>
             </button>
-            <button type="button" class="btn btn-brand btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vine mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vine"></i>
               <span>Vine</span>
             </button>
-            <button type="button" class="btn btn-brand btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-foursquare mr-1" style="margin-bottom: 4px">
               <i class="fa fa-foursquare"></i>
               <span>Forsquare</span>
             </button>
-            <button type="button" class="btn btn-brand btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vimeo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vimeo"></i>
               <span>Vimeo</span>
             </button>
@@ -224,103 +224,103 @@ <h6>Size Large
             </small>
           </h6>
           <p>
-            <button type="button" class="btn btn-brand btn-lg btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-facebook mr-1" style="margin-bottom: 4px">
               <i class="fa fa-facebook"></i>
               <span>Facebook</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-twitter mr-1" style="margin-bottom: 4px">
               <i class="fa fa-twitter"></i>
               <span>Twitter</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-linkedin mr-1" style="margin-bottom: 4px">
               <i class="fa fa-linkedin"></i>
               <span>LinkedIn</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-flickr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-flickr"></i>
               <span>Flickr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-tumblr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-tumblr"></i>
               <span>Tumblr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-xing mr-1" style="margin-bottom: 4px">
               <i class="fa fa-xing"></i>
               <span>Xing</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-github mr-1" style="margin-bottom: 4px">
               <i class="fa fa-github"></i>
               <span>Github</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-html5 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-html5"></i>
               <span>HTML5</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-openid mr-1" style="margin-bottom: 4px">
               <i class="fa fa-openid"></i>
               <span>OpenID</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <i class="fa fa-stack-overflow"></i>
               <span>StackOverflow</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-css3 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-css3"></i>
               <span>CSS3</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-youtube mr-1" style="margin-bottom: 4px">
               <i class="fa fa-youtube"></i>
               <span>YouTube</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-dribbble mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dribbble"></i>
               <span>Dribbble</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-google-plus mr-1" style="margin-bottom: 4px">
               <i class="fa fa-google-plus"></i>
               <span>Google+</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-instagram mr-1" style="margin-bottom: 4px">
               <i class="fa fa-instagram"></i>
               <span>Instagram</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-pinterest mr-1" style="margin-bottom: 4px">
               <i class="fa fa-pinterest"></i>
               <span>Pinterest</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vk mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vk"></i>
               <span>VK</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-yahoo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-yahoo"></i>
               <span>Yahoo</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-behance mr-1" style="margin-bottom: 4px">
               <i class="fa fa-behance"></i>
               <span>Behance</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-dropbox mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dropbox"></i>
               <span>Dropbox</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-reddit mr-1" style="margin-bottom: 4px">
               <i class="fa fa-reddit"></i>
               <span>Reddit</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-spotify mr-1" style="margin-bottom: 4px">
               <i class="fa fa-spotify"></i>
               <span>Spotify</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vine mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vine"></i>
               <span>Vine</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-foursquare mr-1" style="margin-bottom: 4px">
               <i class="fa fa-foursquare"></i>
               <span>Forsquare</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vimeo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vimeo"></i>
               <span>Vimeo</span>
             </button>
@@ -344,157 +344,157 @@ <h6>Size Small
             </small>
           </h6>
           <p>
-            <button type="button" class="btn btn-brand btn-sm btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-facebook mr-1" style="margin-bottom: 4px">
               <i class="fa fa-facebook"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-twitter mr-1" style="margin-bottom: 4px">
               <i class="fa fa-twitter"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-linkedin mr-1" style="margin-bottom: 4px">
               <i class="fa fa-linkedin"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-flickr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-flickr"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-tumblr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-tumblr"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-xing mr-1" style="margin-bottom: 4px">
               <i class="fa fa-xing"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-github mr-1" style="margin-bottom: 4px">
               <i class="fa fa-github"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-html5 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-html5"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-openid mr-1" style="margin-bottom: 4px">
               <i class="fa fa-openid"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <i class="fa fa-stack-overflow"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-css3 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-css3"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-youtube mr-1" style="margin-bottom: 4px">
               <i class="fa fa-youtube"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-dribbble mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dribbble"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-google-plus mr-1" style="margin-bottom: 4px">
               <i class="fa fa-google-plus"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-instagram mr-1" style="margin-bottom: 4px">
               <i class="fa fa-instagram"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-pinterest mr-1" style="margin-bottom: 4px">
               <i class="fa fa-pinterest"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vk mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vk"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-yahoo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-yahoo"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-behance mr-1" style="margin-bottom: 4px">
               <i class="fa fa-behance"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-dropbox mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dropbox"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-reddit mr-1" style="margin-bottom: 4px">
               <i class="fa fa-reddit"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-spotify mr-1" style="margin-bottom: 4px">
               <i class="fa fa-spotify"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vine mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vine"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-foursquare mr-1" style="margin-bottom: 4px">
               <i class="fa fa-foursquare"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vimeo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vimeo"></i>
             </button>
           </p>
           <h6>Size Normal</h6>
           <p>
-            <button type="button" class="btn btn-brand btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-facebook mr-1" style="margin-bottom: 4px">
               <i class="fa fa-facebook"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-twitter mr-1" style="margin-bottom: 4px">
               <i class="fa fa-twitter"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-linkedin mr-1" style="margin-bottom: 4px">
               <i class="fa fa-linkedin"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-flickr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-flickr"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-tumblr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-tumblr"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-xing mr-1" style="margin-bottom: 4px">
               <i class="fa fa-xing"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-github mr-1" style="margin-bottom: 4px">
               <i class="fa fa-github"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-html5 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-html5"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-openid mr-1" style="margin-bottom: 4px">
               <i class="fa fa-openid"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <i class="fa fa-stack-overflow"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-css3 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-css3"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-youtube mr-1" style="margin-bottom: 4px">
               <i class="fa fa-youtube"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-dribbble mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dribbble"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-google-plus mr-1" style="margin-bottom: 4px">
               <i class="fa fa-google-plus"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-instagram mr-1" style="margin-bottom: 4px">
               <i class="fa fa-instagram"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-pinterest mr-1" style="margin-bottom: 4px">
               <i class="fa fa-pinterest"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vk mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vk"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-yahoo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-yahoo"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-behance mr-1" style="margin-bottom: 4px">
               <i class="fa fa-behance"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-dropbox mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dropbox"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-reddit mr-1" style="margin-bottom: 4px">
               <i class="fa fa-reddit"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-spotify mr-1" style="margin-bottom: 4px">
               <i class="fa fa-spotify"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vine mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vine"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-foursquare mr-1" style="margin-bottom: 4px">
               <i class="fa fa-foursquare"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vimeo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vimeo"></i>
             </button>
           </p>
@@ -504,79 +504,79 @@ <h6>Size Large
             </small>
           </h6>
           <p>
-            <button type="button" class="btn btn-brand btn-lg btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-facebook mr-1" style="margin-bottom: 4px">
               <i class="fa fa-facebook"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-twitter mr-1" style="margin-bottom: 4px">
               <i class="fa fa-twitter"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-linkedin mr-1" style="margin-bottom: 4px">
               <i class="fa fa-linkedin"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-flickr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-flickr"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-tumblr mr-1" style="margin-bottom: 4px">
               <i class="fa fa-tumblr"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-xing mr-1" style="margin-bottom: 4px">
               <i class="fa fa-xing"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-github mr-1" style="margin-bottom: 4px">
               <i class="fa fa-github"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-html5 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-html5"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-openid mr-1" style="margin-bottom: 4px">
               <i class="fa fa-openid"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <i class="fa fa-stack-overflow"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-css3 mr-1" style="margin-bottom: 4px">
               <i class="fa fa-css3"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-youtube mr-1" style="margin-bottom: 4px">
               <i class="fa fa-youtube"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-dribbble mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dribbble"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-google-plus mr-1" style="margin-bottom: 4px">
               <i class="fa fa-google-plus"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-instagram mr-1" style="margin-bottom: 4px">
               <i class="fa fa-instagram"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-pinterest mr-1" style="margin-bottom: 4px">
               <i class="fa fa-pinterest"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vk mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vk"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-yahoo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-yahoo"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-behance mr-1" style="margin-bottom: 4px">
               <i class="fa fa-behance"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-dropbox mr-1" style="margin-bottom: 4px">
               <i class="fa fa-dropbox"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-reddit mr-1" style="margin-bottom: 4px">
               <i class="fa fa-reddit"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-spotify mr-1" style="margin-bottom: 4px">
               <i class="fa fa-spotify"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vine mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vine"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-foursquare mr-1" style="margin-bottom: 4px">
               <i class="fa fa-foursquare"></i>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vimeo mr-1" style="margin-bottom: 4px">
               <i class="fa fa-vimeo"></i>
             </button>
           </p>
@@ -599,157 +599,157 @@ <h6>Size Small
             </small>
           </h6>
           <p>
-            <button type="button" class="btn btn-brand btn-sm btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-facebook mr-1" style="margin-bottom: 4px">
               <span>Facebook</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-twitter mr-1" style="margin-bottom: 4px">
               <span>Twitter</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-linkedin mr-1" style="margin-bottom: 4px">
               <span>LinkedIn</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-flickr mr-1" style="margin-bottom: 4px">
               <span>Flickr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-tumblr mr-1" style="margin-bottom: 4px">
               <span>Tumblr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-xing mr-1" style="margin-bottom: 4px">
               <span>Xing</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-github mr-1" style="margin-bottom: 4px">
               <span>Github</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-html5 mr-1" style="margin-bottom: 4px">
               <span>HTML5</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-openid mr-1" style="margin-bottom: 4px">
               <span>OpenID</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <span>StackOverflow</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-css3 mr-1" style="margin-bottom: 4px">
               <span>CSS3</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-youtube mr-1" style="margin-bottom: 4px">
               <span>YouTube</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-dribbble mr-1" style="margin-bottom: 4px">
               <span>Dribbble</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-google-plus mr-1" style="margin-bottom: 4px">
               <span>Google+</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-instagram mr-1" style="margin-bottom: 4px">
               <span>Instagram</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-pinterest mr-1" style="margin-bottom: 4px">
               <span>Pinterest</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vk mr-1" style="margin-bottom: 4px">
               <span>VK</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-yahoo mr-1" style="margin-bottom: 4px">
               <span>Yahoo</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-behance mr-1" style="margin-bottom: 4px">
               <span>Behance</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-dropbox mr-1" style="margin-bottom: 4px">
               <span>Dropbox</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-reddit mr-1" style="margin-bottom: 4px">
               <span>Reddit</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-spotify mr-1" style="margin-bottom: 4px">
               <span>Spotify</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vine mr-1" style="margin-bottom: 4px">
               <span>Vine</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-foursquare mr-1" style="margin-bottom: 4px">
               <span>Forsquare</span>
             </button>
-            <button type="button" class="btn btn-brand btn-sm btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-sm btn-vimeo mr-1" style="margin-bottom: 4px">
               <span>Vimeo</span>
             </button>
           </p>
           <h6>Size Normal</h6>
           <p>
-            <button type="button" class="btn btn-brand btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-facebook mr-1" style="margin-bottom: 4px">
               <span>Facebook</span>
             </button>
-            <button type="button" class="btn btn-brand btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-twitter mr-1" style="margin-bottom: 4px">
               <span>Twitter</span>
             </button>
-            <button type="button" class="btn btn-brand btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-linkedin mr-1" style="margin-bottom: 4px">
               <span>LinkedIn</span>
             </button>
-            <button type="button" class="btn btn-brand btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-flickr mr-1" style="margin-bottom: 4px">
               <span>Flickr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-tumblr mr-1" style="margin-bottom: 4px">
               <span>Tumblr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-xing mr-1" style="margin-bottom: 4px">
               <span>Xing</span>
             </button>
-            <button type="button" class="btn btn-brand btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-github mr-1" style="margin-bottom: 4px">
               <span>Github</span>
             </button>
-            <button type="button" class="btn btn-brand btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-html5 mr-1" style="margin-bottom: 4px">
               <span>HTML5</span>
             </button>
-            <button type="button" class="btn btn-brand btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-openid mr-1" style="margin-bottom: 4px">
               <span>OpenID</span>
             </button>
-            <button type="button" class="btn btn-brand btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <span>StackOverflow</span>
             </button>
-            <button type="button" class="btn btn-brand btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-css3 mr-1" style="margin-bottom: 4px">
               <span>CSS3</span>
             </button>
-            <button type="button" class="btn btn-brand btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-youtube mr-1" style="margin-bottom: 4px">
               <span>YouTube</span>
             </button>
-            <button type="button" class="btn btn-brand btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-dribbble mr-1" style="margin-bottom: 4px">
               <span>Dribbble</span>
             </button>
-            <button type="button" class="btn btn-brand btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-google-plus mr-1" style="margin-bottom: 4px">
               <span>Google+</span>
             </button>
-            <button type="button" class="btn btn-brand btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-instagram mr-1" style="margin-bottom: 4px">
               <span>Instagram</span>
             </button>
-            <button type="button" class="btn btn-brand btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-pinterest mr-1" style="margin-bottom: 4px">
               <span>Pinterest</span>
             </button>
-            <button type="button" class="btn btn-brand btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vk mr-1" style="margin-bottom: 4px">
               <span>VK</span>
             </button>
-            <button type="button" class="btn btn-brand btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-yahoo mr-1" style="margin-bottom: 4px">
               <span>Yahoo</span>
             </button>
-            <button type="button" class="btn btn-brand btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-behance mr-1" style="margin-bottom: 4px">
               <span>Behance</span>
             </button>
-            <button type="button" class="btn btn-brand btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-dropbox mr-1" style="margin-bottom: 4px">
               <span>Dropbox</span>
             </button>
-            <button type="button" class="btn btn-brand btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-reddit mr-1" style="margin-bottom: 4px">
               <span>Reddit</span>
             </button>
-            <button type="button" class="btn btn-brand btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-spotify mr-1" style="margin-bottom: 4px">
               <span>Spotify</span>
             </button>
-            <button type="button" class="btn btn-brand btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vine mr-1" style="margin-bottom: 4px">
               <span>Vine</span>
             </button>
-            <button type="button" class="btn btn-brand btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-foursquare mr-1" style="margin-bottom: 4px">
               <span>Forsquare</span>
             </button>
-            <button type="button" class="btn btn-brand btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-vimeo mr-1" style="margin-bottom: 4px">
               <span>Vimeo</span>
             </button>
           </p>
@@ -759,79 +759,79 @@ <h6>Size Large
             </small>
           </h6>
           <p>
-            <button type="button" class="btn btn-brand btn-lg btn-facebook" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-facebook mr-1" style="margin-bottom: 4px">
               <span>Facebook</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-twitter" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-twitter mr-1" style="margin-bottom: 4px">
               <span>Twitter</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-linkedin" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-linkedin mr-1" style="margin-bottom: 4px">
               <span>LinkedIn</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-flickr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-flickr mr-1" style="margin-bottom: 4px">
               <span>Flickr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-tumblr" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-tumblr mr-1" style="margin-bottom: 4px">
               <span>Tumblr</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-xing" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-xing mr-1" style="margin-bottom: 4px">
               <span>Xing</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-github" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-github mr-1" style="margin-bottom: 4px">
               <span>Github</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-html5" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-html5 mr-1" style="margin-bottom: 4px">
               <span>HTML5</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-openid" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-openid mr-1" style="margin-bottom: 4px">
               <span>OpenID</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-stack-overflow" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-stack-overflow mr-1" style="margin-bottom: 4px">
               <span>StackOverflow</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-css3" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-css3 mr-1" style="margin-bottom: 4px">
               <span>CSS3</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-youtube" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-youtube mr-1" style="margin-bottom: 4px">
               <span>YouTube</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-dribbble" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-dribbble mr-1" style="margin-bottom: 4px">
               <span>Dribbble</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-google-plus" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-google-plus mr-1" style="margin-bottom: 4px">
               <span>Google+</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-instagram" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-instagram mr-1" style="margin-bottom: 4px">
               <span>Instagram</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-pinterest" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-pinterest mr-1" style="margin-bottom: 4px">
               <span>Pinterest</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vk" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vk mr-1" style="margin-bottom: 4px">
               <span>VK</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-yahoo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-yahoo mr-1" style="margin-bottom: 4px">
               <span>Yahoo</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-behance" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-behance mr-1" style="margin-bottom: 4px">
               <span>Behance</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-dropbox" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-dropbox mr-1" style="margin-bottom: 4px">
               <span>Dropbox</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-reddit" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-reddit mr-1" style="margin-bottom: 4px">
               <span>Reddit</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-spotify" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-spotify mr-1" style="margin-bottom: 4px">
               <span>Spotify</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vine" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vine mr-1" style="margin-bottom: 4px">
               <span>Vine</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-foursquare" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-foursquare mr-1" style="margin-bottom: 4px">
               <span>Forsquare</span>
             </button>
-            <button type="button" class="btn btn-brand btn-lg btn-vimeo" style="margin-bottom: 4px">
+            <button type="button" class="btn btn-brand btn-lg btn-vimeo mr-1" style="margin-bottom: 4px">
               <span>Vimeo</span>
             </button>
           </p>
diff --git a/src/app/views/notifications/modals.component.html b/src/app/views/notifications/modals.component.html
index 484a472f3..44d5337b6 100644
--- a/src/app/views/notifications/modals.component.html
+++ b/src/app/views/notifications/modals.component.html
@@ -7,29 +7,29 @@
         </div>
         <div class="card-body">
           <!-- Button trigger modal -->
-          <button type="button" class="btn btn-secondary" data-toggle="modal" (click)="myModal.show()">
+          <button type="button" class="btn btn-secondary mr-1" data-toggle="modal" (click)="myModal.show()">
             Launch demo modal
           </button>
-          <button type="button" class="btn btn-secondary" data-toggle="modal" (click)="largeModal.show()">
+          <button type="button" class="btn btn-secondary mr-1" data-toggle="modal" (click)="largeModal.show()">
             Launch large modal
           </button>
-          <button type="button" class="btn btn-secondary" data-toggle="modal" (click)="smallModal.show()">
+          <button type="button" class="btn btn-secondary mr-1" data-toggle="modal" (click)="smallModal.show()">
             Launch small modal
           </button>
           <hr>
-          <button type="button" class="btn btn-primary" data-toggle="modal" (click)="primaryModal.show()">
+          <button type="button" class="btn btn-primary mr-1" data-toggle="modal" (click)="primaryModal.show()">
             Primary modal
           </button>
-          <button type="button" class="btn btn-success" data-toggle="modal" (click)="successModal.show()">
+          <button type="button" class="btn btn-success mr-1" data-toggle="modal" (click)="successModal.show()">
             Success modal
           </button>
-          <button type="button" class="btn btn-warning" data-toggle="modal" (click)="warningModal.show()">
+          <button type="button" class="btn btn-warning mr-1" data-toggle="modal" (click)="warningModal.show()">
             Warning modal
           </button>
-          <button type="button" class="btn btn-danger" data-toggle="modal" (click)="dangerModal.show()">
+          <button type="button" class="btn btn-danger mr-1" data-toggle="modal" (click)="dangerModal.show()">
             Danger modal
           </button>
-          <button type="button" class="btn btn-info" data-toggle="modal" (click)="infoModal.show()">
+          <button type="button" class="btn btn-info mr-1" data-toggle="modal" (click)="infoModal.show()">
             Info modal
           </button>
         </div>
diff --git a/src/scss/vendors/_variables.scss b/src/scss/vendors/_variables.scss
index 14c6d7f93..3d8464b48 100644
--- a/src/scss/vendors/_variables.scss
+++ b/src/scss/vendors/_variables.scss
@@ -1,4 +1,4 @@
 // Override Boostrap variables
 @import "../variables";
-@import "node_modules/bootstrap/scss/mixins";
-@import "node_modules/@coreui/coreui/scss/variables";
+@import "~bootstrap/scss/mixins";
+@import "~@coreui/coreui/scss/variables";