diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep
--- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep	2022-02-28 11:13:38.757816366 +0000
+++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep	2022-02-28 15:18:00.000000000 +0000
@@ -136,24 +136,6 @@
  
       <div class="container-fluid">
         <div class="row mb-2">
-<!--
-          <div class="col-sm-3">
-			 %# Extract the initial h1 to 3 heading from content and use that as header
-			 % my $content = content('module');
-			 %# my $heading;
-			 %# if ($content =~ /<h(1|2|3)>[\n]*[\s]*(.*)[\s]*[\n]*<\/h(1|2|3)>/i) {
-			 %#	   $heading = $2;
-			 %# } else { $heading = "unknown";}
-            %#= "$heading";
-            %#and take out heading that we have used already - this does not work - left for later...
-            %# my $startofheading = index(lc($content),"<h$3>");
-            %# my $endofheading = index(lc($content),"<\/h$3>");
-            %# my $replacestring = substr($content,$startofheading,$endofheading-$startofheading+5);
-            %# my $content =~ s/$replacestring//gim;
-            %# my $content =~ s/<p>//gim;
-            %# my $content =~ s/<\/p>//gim;
-          </div>
--->
 			  
 			<div class="col-sm-5">
 				<b><%= session 'SystemName' %>@<%= session 'DomainName' %></b> 
@@ -216,6 +198,7 @@
     <!-- Main content -->
     <div class="content">
       <div class="container-fluid">
+		% my $content = content('module');
 		%= $content;
       </div><!-- /.container-fluid -->
     </div>
@@ -254,7 +237,6 @@
 
 	<!-- jQuery -->
 	%= javascript "/plugins/jquery/jquery.min.js"
-	%= javascript "/plugins/hideShowPassword.min.js"
 
 	<!-- Bootstrap 4 -->
 	%= javascript "/plugins/bootstrap/js/bootstrap.bundle.min.js"
@@ -279,78 +261,76 @@
 			const classSelector = 'adminlte-version';
 			const versionType = 'full'; // 'full' OR true;
 			for (var i = 0, max = document.styleSheets.length; i < max; i++) {
-			if ((document.styleSheets[i].href).includes("adminlte")) {
-			  $.ajax({
-				url: document.styleSheets[i].href,
-				dataType: "text",
-				success: function(cssText) {
-				  const searchReg = /AdminLTE v([0-9.]{0,})/;
-				  const result = cssText.match(searchReg);  
-				  $(`.${classSelector}`).text(result[versionType == 'full' ? 0 : 1]);
+				if ((document.styleSheets[i].href).includes("adminlte")) {
+				  $.ajax({
+					url: document.styleSheets[i].href,
+					dataType: "text",
+					success: function(cssText) {
+					  const searchReg = /AdminLTE v([0-9.]{0,})/;
+					  const result = cssText.match(searchReg);  
+					  $(`.${classSelector}`).text(result[versionType == 'full' ? 0 : 1]);
+					}
+					});
 				}
-			  });
 			}
-			}
-			/* Overload the sme classes with those from AdminLTE */
-			$(".sme-error").addClass("card card-danger card-body");
-			$(".sme-warning").addClass("card card-warning card-body");
-			$(".success").addClass("card card-success card-body");
-			$(".sme-success").addClass("card card-success card-body");
-			$("table.sme-border").addClass("table table-striped"); 
-			
-			$("#footer").addClass("card card-info card-body"); 
-			$(".module").addClass("card card-info card-body");
-			$(".central").addClass("card card-info card-body");
-			$(".review-panel table").addClass("table");
-			$(".module h1").addClass("card-header");
-			//$(".module h2").addClass("card-subtitle");
-			
-			
-			$(".menu-cell").addClass("nav-item");
-			$(".item").addClass("nav-link");			
-			$(".infobar").addClass("row");
-			$(".label").addClass("float-left");
-			$(".action").addClass("float-right btn btn-primary");
+		/* Overload the sme classes with those from AdminLTE */
+		$(".sme-error").addClass("card card-danger card-body");
+		$(".sme-warning").addClass("card card-warning card-body");
+		$(".success").addClass("card card-success card-body");
+		$(".sme-success").addClass("card card-success card-body");
+		$("table.sme-border").addClass("table table-striped"); 
+		
+		$("#footer").addClass("card card-info card-body"); 
+		$(".module").addClass("card card-info card-body");
+		$(".central").addClass("card card-info card-body");
+		$(".review-panel table").addClass("table");
+		$(".module h1").addClass("card-header");
+		//$(".module h2").addClass("card-subtitle");
+		
+		
+		$(".menu-cell").addClass("nav-item");
+		$(".item").addClass("nav-link");			
+		$(".infobar").addClass("row");
+		$(".label").addClass("float-left");
+		$(".action").addClass("float-right btn btn-primary");
+	
 		
-			
-			$("#h2l1").addClass("row");
-			$("#h2e22").addClass("float-right");
-			$("#h2e23").addClass("float-right");
-			$("#h2e12").addClass("float-right");
-			
-			/*Dark mode changes*/
-			var mode = localStorage.getItem('darkmode');
-			var myselect = document.getElementById("darkmodeswtid");
-			if (mode  == "") {myselect.checked = false;}
-			else {myselect.checked = true;}
-			$("#darkmodeswtid").val(mode).change();
+		$("#h2l1").addClass("row");
+		$("#h2e22").addClass("float-right");
+		$("#h2e23").addClass("float-right");
+		$("#h2e12").addClass("float-right");
+		
+		/*Dark mode changes*/
+		var mode = localStorage.getItem('darkmode');
+		var myselect = document.getElementById("darkmodeswtid");
+		if (mode  == "") {myselect.checked = false;}
+		else {myselect.checked = true;}
+		$("#darkmodeswtid").val(mode).change();
+	
 		
-			
-			/* Sort out font size */
-			var fontsize = localStorage.getItem('fontsize');
-			if (fontsize == ""){fontsize = 'text-md'} 
-			$("#fontsizeid").val(fontsize).change();
-			
-			
-			var url = window.location;
-
-			// for sidebar menu entirely but not cover treeview - not yet working...
-			// 
-			$('.nav-link').filter(function() {
-				 return this.href == url;
-			}).parent().addClass('active');
-			
-			/*
-   		    var options = "";
-			var breadcrumb = $('.breadcrumb').breadcrumb(options);
-			breadcrumb.push('Level');
-			breadcrumb.pop();
-			*/
-			//alert("Hello world");
-			$("#login_password").togglePasswordVisibility();
+		/* Sort out font size */
+		var fontsize = localStorage.getItem('fontsize');
+		if (fontsize == ""){fontsize = 'text-md'} 
+		$("#fontsizeid").val(fontsize).change();
+		
+		
+		var url = window.location;
 
+		// for sidebar menu entirely but not cover treeview - not yet working...
+		// 
+		$('.nav-link').filter(function() {
+			 return this.href == url;
+		}).parent().addClass('active');
+		
+		/*
+		var options = "";
+		var breadcrumb = $('.breadcrumb').breadcrumb(options);
+		breadcrumb.push('Level');
+		breadcrumb.pop();
+		*/
 			
 		});
+
 		function SetFontSize(){ 
 			var myselect = document.getElementById("fontsizeid");
 			var textclass = myselect.options[myselect.selectedIndex].value;
@@ -380,22 +360,6 @@
 			 return this.href == url;
 		}).parentsUntil(".sidebar-menu > .treeview-menu").addClass('active');
 		
-		/*
-		//Setup passord visibility toggle
-		(function ($) {
-			$.fn.togglePasswordVisibility = function() {
-			togglePassword.addEventListener('click', function (e) {
-				// toggle the type attribute
-				const togglePassword = document.getElementById('togglePassword');
-				const password = document.getElementById('login-password');
-				const type = password.getAttribute('type') === 'password' ? 'text' : 'password';
-				password.setAttribute('type', type);
-				// toggle the eye slash icon
-				this.classList.toggle('fa-eye-slash');
-			});
-		};
-		}(jQuery));
-		*/
 
 		</script>
 </body>
diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep
--- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep	2022-02-28 11:13:38.753816328 +0000
+++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep	2022-02-28 14:51:00.000000000 +0000
@@ -62,7 +62,7 @@
 		  </div>
 		</div>
 		<div class="input-group mb-3">
-		  <input type="password" name='Password' id='login-password' class="form-control" placeholder="<%=l 'PASSWORD'%>">
+		  <input type="password" name='Password' id='id_password' class="form-control" placeholder="<%=l 'PASSWORD'%>">
 		  <div class="input-group-append">
 			<div class="input-group-text">
 				<i class="far fa-eye" id="togglePassword"></i>