diff --git a/bower.json b/bower.json
index 8a0fecdd..5479e5d1 100644
--- a/bower.json
+++ b/bower.json
@@ -4,14 +4,14 @@
   "devDependencies": {},
   "dependencies": {
     "animate.css": "~3.4.0",
-    "bootstrap": "v4.0.0-alpha.3",
+    "bootstrap": "v4.0.0-alpha.5",
     "font-awesome": "~4.5.0",
     "jquery": "~2.1.4",
     "metisMenu": "~2.0.3",
     "nprogress": "~0.2.0",
     "responsive-bootstrap-toolkit": "~2.5.0",
     "Sortable": "~1.4.2",
-    "tether": "~1.1.1",
+    "tether": "~1.3.7",
     "tinycolor": "~1.2.1",
     "dropzone": "~4.2.0",
     "jquery.are-you-sure": "~1.9"
diff --git a/resources/assets/admin/js/app.js b/resources/assets/admin/js/app.js
index fbb223ad..b649f265 100644
--- a/resources/assets/admin/js/app.js
+++ b/resources/assets/admin/js/app.js
@@ -82,25 +82,6 @@ $ (function () {
 	});
 });
 
-// /***********************************************
-//  *        NProgress Settings
-//  ***********************************************/
-// var npSettings = {
-// 	easing: 'ease',
-// 	speed: 500
-// };
-//
-// NProgress.configure (npSettings);
-// $ (function () {
-// 	setSameHeights ();
-//
-// 	var resizeTimer;
-//
-// 	$ (window).resize (function () {
-// 		clearTimeout (resizeTimer);
-// 		resizeTimer = setTimeout (setSameHeights, 150);
-// 	});
-// });
 
 function setSameHeights($container) {
 
@@ -183,38 +164,6 @@ $ (function () {
 
 });
 
-// $ (function () {
-
-	// // set sortable options
-	// $ ('.images-container').sortable ({
-	// 	animation: 150,
-	// 	handle: ".control-btn.move",
-	// 	draggable: ".image-container",
-	// 	onMove: function (evt) {
-	// 		var $relatedElem = $ (evt.related);
-	//
-	// 		if ($relatedElem.hasClass ('add-image')) {
-	// 			return false;
-	// 		}
-	// 	}
-	// });
-	//
-	// var $controlsButtons = $ ('.controls');
-	//
-	// var $controlsButtonsStar = $controlsButtons.find ('.star');
-	//
-	// $controlsButtonsStar.on ('click', function (e) {
-	// 	e.preventDefault ();
-	//
-	// 	$controlsButtonsStar.removeClass ('active');
-	// 	$controlsButtonsStar.parents ('.image-container').removeClass ('main');
-	//
-	// 	$ (this).addClass ('active');
-	//
-	// 	$ (this).parents ('.image-container').addClass ('main');
-	// })
-// });
-
 $ (function () {
 	$ ('.nav-profile > li > a').on ('click', function () {
 		var $el = $ (this).next ();
@@ -242,22 +191,14 @@ $ (function () {
 	// Position switchers
 	var $customizeMenuRadioBtns = $customizeMenu.find ('.radio');
 
-	// /////////////////////////////////////////////////
-
-	// Initial state
-
-	// On setting event, set corresponding options
-
-	// Update customize view based on options
-
-	// Update theme based on options
-
 	/************************************************
 	 *            Initial State
 	 *************************************************/
 
 	setThemeSettings ();
 
+	setSameHeights();
+
 	/************************************************
 	 *               Events
 	 *************************************************/
@@ -498,13 +439,3 @@ $ (document).ready (function () {
 
 	$('form').areYouSure();
 });
-
-// /***********************************************
-//  *        NProgress Settings
-//  ***********************************************/
-//
-// // start load bar
-// NProgress.start ();
-//
-// // end loading bar
-// NProgress.done ();
\ No newline at end of file
diff --git a/resources/assets/sass/admin/_common/_styles/layout.scss b/resources/assets/sass/admin/_common/_styles/layout.scss
index 47b0ec98..a5c1edef 100644
--- a/resources/assets/sass/admin/_common/_styles/layout.scss
+++ b/resources/assets/sass/admin/_common/_styles/layout.scss
@@ -3,8 +3,8 @@
 
 .row {
 	.col {
-		padding-left: $grid-gutter-width/2;
-		padding-right: $grid-gutter-width/2;
+		padding-left: $grid-gutter-width-base/2;
+		padding-right: $grid-gutter-width-base/2;
 		float: left;
 	}
 }
diff --git a/resources/views/admin/templates/list.blade.php b/resources/views/admin/templates/list.blade.php
index 95e6e0bc..df3181aa 100644
--- a/resources/views/admin/templates/list.blade.php
+++ b/resources/views/admin/templates/list.blade.php
@@ -14,5 +14,4 @@
             </div>
         </div>
     </div>
-
-@stop
\ No newline at end of file
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/templates/templatesTiles.blade.php b/resources/views/admin/templates/templatesTiles.blade.php
index 4a5d5041..85825daf 100644
--- a/resources/views/admin/templates/templatesTiles.blade.php
+++ b/resources/views/admin/templates/templatesTiles.blade.php
@@ -49,7 +49,7 @@
             var newTemplateName = prompt ("@lang('admin/templates.newTemplateName')", templateName + "_" + "@lang('admin/templates.newTemplateNameSuffix')");
 
             // no name given - give up
-            if (newTemplateName == null) return;
+            if (newTemplateName === null) return;
 
             // copy given template
             $.post ('{{route('templates.postCopy')}}', {
@@ -57,7 +57,7 @@
                 newName: newTemplateName,
                 _token: "{{csrf_token()}}"
             }, function (data) {
-                if (data.status == 'success') {
+                if (data.status === 'success') {
                     location.reload ();
                 }
             });