diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 479f68198..49d53e674 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -606,7 +606,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		print "<th colspan=\"2\">".htmlspecialchars($latestContent->getOriginalFileName())."</th>\n";
 //		print "<th width='*'>".getMLText("file")."</th>\n";
 //		print "<th width='25%'>".getMLText("comment")."</th>\n";
-		print "<th width='20%'>".getMLText("status")."</th>\n";
 		print "<th width='25%'></th>\n";
 		print "</tr></thead><tbody>\n";
 		print "<tr>\n";
@@ -643,7 +642,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".htmlspecialchars($updatingUser->getEmail())."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
 		print "<li>".getLongReadableDate($latestContent->getDate())."</li>";
 
+		print "<li>".getMLText('status').": ".getOverallStatusText($status["status"]);
+		if ( $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP || $status["status"]==S_IN_WORKFLOW || $status["status"]==S_EXPIRED ){
+			print "<br><span".($document->hasExpired()?" class=\"warning\" ":"").">".(!$document->getExpires() ? getMLText("does_not_expire") : getMLText("expires").": ".getReadableDate($document->getExpires()))."</span>";
+		}
+		print "</li>";
 		print "</ul>\n";
+
 		$txt = $this->callHook('showVersionComment', $latestContent);
 		if($txt) {
 			echo $txt;
@@ -655,13 +660,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		$this->printVersionAttributes($folder, $latestContent);
 		print "</ul></td>\n";
 
-		print "<td width='10%'>";
-		print getOverallStatusText($status["status"]);
-		if ( $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP || $status["status"]==S_IN_WORKFLOW || $status["status"]==S_EXPIRED ){
-			print "<br><span".($document->hasExpired()?" class=\"warning\" ":"").">".(!$document->getExpires() ? getMLText("does_not_expire") : getMLText("expires").": ".getReadableDate($document->getExpires()))."</span>";
-		}
-		print "</td>";
-
 		print "<td>";
 
 		if ($file_exists){
@@ -740,14 +738,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			$this->contentContainerStart();
 			$statuslog = $latestContent->getStatusLog();
 			echo "<table class=\"table table-condensed table-sm\"><thead>";
-			echo "<th>".getMLText('date')."</th><th>".getMLText('status')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
+			echo "<th>".getMLText('date')."/".getMLText('user')."</th><th>".getMLText('status')."</th><th>".getMLText('comment')."</th></tr>\n";
 			echo "</thead><tbody>";
 			foreach($statuslog as $entry) {
 				if($suser = $dms->getUser($entry['userID']))
 					$fullname = htmlspecialchars($suser->getFullName());
 				else
 					$fullname = "--";
-				echo "<tr><td>".getLongReadableDate($entry['date'])."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
+				echo "<tr><td>".getLongReadableDate($entry['date'])."<br />".$fullname."</td><td>".getOverallStatusText($entry['status'])."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
 			}
 			print "</tbody>\n</table>\n";
 			$this->contentContainerEnd();
@@ -1242,7 +1240,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			print "<table class=\"table\">";
 			print "<thead>\n<tr>\n";
 			print "<th colspan=\"2\"></th>\n";
-			print "<th width='20%'>".getMLText("status")."</th>\n";
 			print "<th width='25%'></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
@@ -1274,7 +1271,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 					print "</a>\n";
 				}
 				print "</td>\n";
-				print "<td><ul class=\"properties unstyled\">\n";
+				print "<td><ul class=\"actions unstyled\">\n";
 				print "<li>".htmlspecialchars($version->getOriginalFileName())."</li>\n";
 				print "<li>".getMLText('version').": ".$version->getVersion()."</li>\n";
 				if ($file_exists) print "<li>". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."</li>";
@@ -1282,6 +1279,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 				$updatingUser = $version->getUser();
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".htmlspecialchars($updatingUser->getEmail())."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($version->getDate())."</li>";
+				print "<li>".getMLText('status').": ".getOverallStatusText($vstat["status"])."</li>";
 				print "</ul>\n";
 				$txt = $this->callHook('showVersionComment', $version);
 				if($txt) {
@@ -1294,7 +1292,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 				$this->printVersionAttributes($folder, $version);
 				print "</ul></td>\n";
 //				print "<td>".htmlspecialchars($version->getComment())."</td>";
-				print "<td>".getOverallStatusText($vstat["status"])."</td>";
 				print "<td>";
 				if ($file_exists){
 					print "<ul class=\"actions unstyled\">";