diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8c0f9249f..386d9f963 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -285,6 +285,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
+		echo "   <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		echo "  </div>\n";
 		echo " </div>\n";
@@ -375,8 +376,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "   <a class=\"btn btn-navbar\" href=\"../op/op.Logout.php\">\n";
 		echo "     <span class=\"fa fa-sign-out\"></span>\n";
 		echo "   </a>\n";
-		if(!empty($this->extraheader['favicon']))
-			echo $this->extraheader['favicon'];
 		echo "   <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index f15a0eb0a..aeb23bd7b 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -98,6 +98,7 @@ $(document).ready( function() {
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
 		$this->contentStart();
+		echo "<div id=\"login_wrapper\">\n";
 		$this->pageNavigation(getMLText("sign_in"));
 		if($msg)
 			$this->errorMsg(htmlspecialchars($msg));
@@ -115,7 +116,7 @@ $(document).ready( function() {
 				'type'=>'text',
 				'id'=>'login',
 				'name'=>'login',
-				'placeholder'=>'login',
+				'placeholder'=>getMLText('user_login'),
 				'autocomplete'=>'on',
 				'required'=>true
 			)
@@ -127,6 +128,7 @@ $(document).ready( function() {
 				'type'=>'password',
 				'id'=>'pwd',
 				'name'=>'pwd',
+				'placeholder'=>getMLText('password'),
 				'autocomplete'=>'off',
 				'required'=>true
 			)
@@ -169,8 +171,8 @@ $(document).ready( function() {
 				$html
 			);
 		}
-		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_login'));
+		$this->contentContainerEnd();
 ?>
 </form>
 <?php
@@ -184,6 +186,7 @@ $(document).ready( function() {
 			print implode(' | ', $tmpfoot);
 			print "</p>\n";
 		}
+		echo "</div>\n";
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 732abbef8..2ce7692c9 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -1,9 +1,18 @@
 body { /* Add top padding for full-width layout */
-	padding-top: 4.0rem;
+	padding-top: 3.7rem;
+}
+#login_wrapper {
+	margin: auto auto;
+	width: 360px;
+}
+@media (max-width: 575px) { 
+	#login_wrapper {
+		width: 100%;
+	}
 }
 
 a.navbar-brand img {
-	height: 2.3rem;
+	height: 2.0rem;
 }
 
 .dropdown-submenu {
diff --git a/views/bootstrap4/styles/styles.css b/views/bootstrap4/styles/styles.css
index ab3477d5e..91eded732 100644
--- a/views/bootstrap4/styles/styles.css
+++ b/views/bootstrap4/styles/styles.css
@@ -1,7 +1,3 @@
-.navbar-brand img {
-	height: 2.3rem;
-}
-
 ul.jqtree-tree ul.jqtree_common {
 	margin-left: 22px;
 }