diff --git a/app/CMS/Helpers/Traits/Nullable.php b/app/CMS/Helpers/Traits/Nullable.php
index 7221d013..bff9fd73 100644
--- a/app/CMS/Helpers/Traits/Nullable.php
+++ b/app/CMS/Helpers/Traits/Nullable.php
@@ -17,7 +17,7 @@ trait Nullable {
      * @return null|string
      */
     public function nullableDate($date) {
-        return empty($date) ? null : Carbon::parse($date)->toDateTimeString();
+        return empty($date) ? null : Carbon::createFromFormat(config('app.date_format'), $date)->toDateTimeString();
     }
 
     /**
diff --git a/gulpfile.js b/gulpfile.js
index 226ae6e4..826d0d1e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -26,13 +26,16 @@ elixir (function (mix) {
 			'tinycolor/dist/tinycolor-min.js',
 			'chart.js/dist/Chart.bundle.min.js',
 			'jquery.are-you-sure/jquery.are-you-sure.js',
+			'../node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
 			'../resources/assets/admin/js/*.js',
 		], 'public/js/vendor.js', 'bower_components')
 		.copy ('bower_components/font-awesome/css/font-awesome.min.css', 'public/css')
+		.copy ('node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.css', 'public/css')
 		.copy ('bower_components/font-awesome/fonts', 'public/fonts')
 		.sass (['bootstrap/bootstrap.scss'], 'public/css/admin/bootstrap.css')
 		.styles ([
 			'../../../public/css/admin/bootstrap.css',
+			'../../../public/css/bootstrap-datepicker.css',
 			'../../../bower_components/animate.css/animate.css',
 		], 'public/css/admin/style.css')
 		.remove ('public/css/admin/theme.scss');
diff --git a/package-lock.json b/package-lock.json
index bb35f0ce..367e2b1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -152,6 +152,14 @@
         "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
       }
     },
+    "bootstrap-datepicker": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.7.1.tgz",
+      "integrity": "sha1-Tuf680iI2+x4NPv52+fEJ34B3a8=",
+      "requires": {
+        "jquery": "3.2.1"
+      }
+    },
     "bower": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz",
@@ -1761,8 +1769,7 @@
     "jquery": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=",
-      "dev": true
+      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
     },
     "json-stable-stringify": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 6a7c2584..d0702904 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "lodash": "^4.16.2"
   },
   "dependencies": {
+    "bootstrap-datepicker": "^1.7.1",
     "laravel-elixir-remove": "^0.2.1"
   }
 }
diff --git a/resources/assets/admin/css/custom.css b/resources/assets/admin/css/custom.css
index d0346f35..53e8e925 100644
--- a/resources/assets/admin/css/custom.css
+++ b/resources/assets/admin/css/custom.css
@@ -437,5 +437,4 @@ img {
 	white-space: nowrap;
 	background: none;
 	border: 0;
-
 }
\ No newline at end of file
diff --git a/resources/assets/admin/js/app.js b/resources/assets/admin/js/app.js
index 5ca40345..3e9b8b9e 100644
--- a/resources/assets/admin/js/app.js
+++ b/resources/assets/admin/js/app.js
@@ -20,6 +20,10 @@ $ (document).ready (function () {
 	$ ('form').areYouSure ();
 });
 
+$ ('.date').datepicker ({
+	format: 'dd. mm. yyyy'
+});
+
 $ ('.checkbox').change (function () {
 	var e = $ (this);
 	var checked = e.is (':checked');
diff --git a/resources/views/admin/snippets/ckEditor.blade.php b/resources/views/admin/snippets/ckEditor.blade.php
index 785794d6..8c780a9f 100644
--- a/resources/views/admin/snippets/ckEditor.blade.php
+++ b/resources/views/admin/snippets/ckEditor.blade.php
@@ -19,7 +19,7 @@
 		basicEntities: false,
 		entities_greek: false,
 		entities_latin: false,
-		height: 550,
+		height: {{$height or 550}},
 		removePlugins: 'about,scayt', //elementspath
 		extraPlugins: 'justify',
 		enterMode: CKEDITOR.ENTER_P,