diff --git a/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js b/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js
index abd8654..d959d1b 100644
--- a/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js
+++ b/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js
@@ -9,12 +9,12 @@
       .directive('selectpicker', selectpicker);
 
   /** @ngInject */
-  function selectpicker($timeout) {
+  function selectpicker() {
     return {
       restrict: 'A',
       link: function( $scope, elem) {
-        $timeout(function() {
-          $(elem).selectpicker({dropupAuto: false});
+        setTimeout(function() {
+          elem.selectpicker({dropupAuto: false});
         }, 0);
       }
     };
diff --git a/src/app/pages/maps/leaflet/LeafletPageCtrl.js b/src/app/pages/maps/leaflet/LeafletPageCtrl.js
index 5cb7c33..6ad189a 100644
--- a/src/app/pages/maps/leaflet/LeafletPageCtrl.js
+++ b/src/app/pages/maps/leaflet/LeafletPageCtrl.js
@@ -11,7 +11,7 @@
   /** @ngInject */
   function LeafletPageCtrl($timeout) {
     function initialize() {
-      L.Icon.Default.imagePath = 'assets/img/theme/vendor/leaflet/';
+      L.Icon.Default.imagePath = 'assets/img/theme/vendor/leaflet/dist/images';
       var map = L.map(document.getElementById('leaflet-map')).setView([51.505, -0.09], 13);
       L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
         attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
index 2ecb310..c11cc5b 100644
--- a/src/sass/app/_form.scss
+++ b/src/sass/app/_form.scss
@@ -469,8 +469,7 @@ label.custom-input-danger {
       border-left: 1px solid $default;
       border-right: 1px solid $default;
       border-bottom-color: $default;
-      border-bottom-left-radius: 5px;
-      border-bottom-right-radius: 5px;
+      border-radius: 0 0 5px 5px;
     }
     > .btn.dropdown-toggle {
       border-bottom-left-radius: 0;
diff --git a/src/sass/app/_typography.scss b/src/sass/app/_typography.scss
index 82ccb5c..0b6dafe 100644
--- a/src/sass/app/_typography.scss
+++ b/src/sass/app/_typography.scss
@@ -8,9 +8,10 @@ h1.color, h2.color, h3.color, h4.color, h5.color, h6.color {
   color: $danger;
 }
 
-a {
+body a {
   color: $activelink;
   text-decoration: none !important;
+  transition: color 0.2s ease;
   &:hover {
     color: $hoverlink;
   }
diff --git a/src/sass/theme/_buttons.scss b/src/sass/theme/_buttons.scss
index c7a4b8c..4b79126 100644
--- a/src/sass/theme/_buttons.scss
+++ b/src/sass/theme/_buttons.scss
@@ -63,7 +63,7 @@ $hover: 24;
   .dropdown-toggle:focus {
     outline: none !important;
   }
-  .btn-default:focus{
+  button.btn-default:focus{
     color: $default;
   }
   .btn{
diff --git a/src/sass/theme/_table.scss b/src/sass/theme/_table.scss
index 19e4586..7ac4800 100644
--- a/src/sass/theme/_table.scss
+++ b/src/sass/theme/_table.scss
@@ -65,7 +65,7 @@
   .editable-wrap {
     vertical-align: super;
   }
-  input.editable-input {
+  .editable-controls input.editable-input {
     width: 110px;
   }
   td {
diff --git a/src/sass/theme/dashboard/_calendar.scss b/src/sass/theme/dashboard/_calendar.scss
index 21ff834..7e1e502 100644
--- a/src/sass/theme/dashboard/_calendar.scss
+++ b/src/sass/theme/dashboard/_calendar.scss
@@ -1,4 +1,4 @@
-#calendar.blurCalendar{
+div.blurCalendar{
  font-size: 12px;
 }
 .fc {
diff --git a/src/sass/theme/dashboard/_timeline.scss b/src/sass/theme/dashboard/_timeline.scss
index b9f0edc..45ca39f 100644
--- a/src/sass/theme/dashboard/_timeline.scss
+++ b/src/sass/theme/dashboard/_timeline.scss
@@ -200,15 +200,15 @@
   }
 
   .cd-timeline-content-yellow {
-    @include cd-timeline-left-color($warning-bg);
+    @include cd-timeline-left-color(rgba(0,0,0,.2));
   }
 
   .cd-timeline-content-red {
-    @include cd-timeline-left-color($danger-bg);
+    @include cd-timeline-left-color(rgba(0,0,0,.2));
   }
 
   .cd-timeline-content-blue {
-    @include cd-timeline-left-color($primary-bg);
+    @include cd-timeline-left-color(rgba(0,0,0,.2));
   }
 
   .cd-timeline-block:nth-child(even) .cd-timeline-content {
@@ -231,13 +231,13 @@
         }
       }
       &.cd-timeline-content-yellow {
-        @include cd-timeline-right-color($warning-bg);
+        @include cd-timeline-right-color(rgba(0,0,0,.2));
       }
       &.cd-timeline-content-red {
-        @include cd-timeline-right-color($danger-bg);
+        @include cd-timeline-right-color(rgba(0,0,0,.2));
       }
       &.cd-timeline-content-blue {
-        @include cd-timeline-right-color($primary-bg);
+        @include cd-timeline-right-color(rgba(0,0,0,.2));
       }
     }
   }