diff --git a/CHANGELOG b/CHANGELOG
index 007aab830..09d45b02e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -146,6 +146,7 @@
 - allow multiple dependencies on seeddms of extension
 - add table with chart data below chart
 - do now show tasks in menu if workflow is turned off completely
+- do not show hidden users in session list
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.15
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 324e4880b..83a5a1f62 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1117,7 +1117,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function formSubmit($value, $name='') { /* {{{ */
 		echo "<div class=\"controls\">\n";
-		echo "<button type=\"submit\" class=\"btn\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').">".$value."</button>\n";
+		echo "<button type=\"submit\" class=\"btn btn-primary\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').">".$value."</button>\n";
 		echo "</div>\n";
 	} /* }}} */
 
diff --git a/views/bootstrap/class.Session.php b/views/bootstrap/class.Session.php
index 4e3dd060a..5d3f7ee58 100644
--- a/views/bootstrap/class.Session.php
+++ b/views/bootstrap/class.Session.php
@@ -53,20 +53,34 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 		if ($user->isGuest() || count($sessions) == 0) {
 			return '';
 		}
-		$content = '';
-		$content .= "   <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown add-session-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".count($sessions).") <i class=\"icon-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+
+		/* $hasuser will be set to true when at least one of the logged in users
+		 * is visible and not hidden in user lists.
+		 */
+		$c = 0;
+		$ucontent = '';
 		foreach($sessions as $session) {
 			if($sesuser = $dms->getUser($session->getUser()))
-				if(!$sesuser->isHidden())
-					$content .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " (".getReadableDuration(time()-$session->getLastAccess()).")" : "")."</a></li>\n";
+				if(!$sesuser->isHidden()) {
+					$c++;
+					$hasuser = true;
+					$ucontent .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " (".getReadableDuration(time()-$session->getLastAccess()).")" : "")."</a></li>\n";
+				}
+		}
+		if($c) {
+			$content = '';
+			$content .= "   <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
+			$content .= "    <li class=\"dropdown add-session-area\">\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+			$content .= $ucontent;
+			$content .= "     </ul>\n";
+			$content .= "    </li>\n";
+			$content .= "   </ul>\n";
+			echo $content;
+		} else {
+			return '';
 		}
-		$content .= "     </ul>\n";
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
-		echo $content;
 	} /* }}} */
 
 }
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 324ee65f6..9b0941573 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1570,8 +1570,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		  <div class="tab-pane <?php if($currenttab == 'attachments') echo 'active'; ?>" id="attachments">
 <?php
 
-		$this->contentContainerStart();
-
 		if (count($files) > 0) {
 
 			print "<table class=\"table\">";
@@ -1653,11 +1651,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tbody>\n</table>\n";	
 
 		}
-		else printMLText("no_attached_files");
+		else $this->infoMsg(getMLText("no_attached_files"));
+
+		$this->contentContainerStart();
 
 		if($accessobject->check_controller_access('AddFile')) {
 			if ($document->getAccessMode($user) >= M_READWRITE){
-				print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
+				print $this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn btn-primary'), getMLText("add"), false, true)."\n";
 			}
 		}
 		$this->contentContainerEnd();