diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8780a602b..98eeeb756 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -459,7 +459,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		print "<table class=\"table\">";
 		print "<thead>\n<tr>\n";
-		print "<th colspan=\"2\">".$latestContent->getOriginalFileName()."</th>\n";
+		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";
@@ -467,17 +467,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</tr></thead><tbody>\n";
 		print "<tr>\n";
 		print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-		/*
-		print "<ul class=\"actions unstyled\">";
-
-		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\" class=\"btn btn-medium\"><i class=\"icon-download\"></i><br />".getMLText("download")."</a></li>";
-			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\" class=\"btn btn-medium\"><i class=\"icon-star\"></i><br />" . getMLText("view_online") . "</a></li>";
-		}else print "<li><img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></li>";
-
-		print "</ul>";
-		*/
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 		$previewer->setConverters($previewconverters);
 		$previewer->createPreview($latestContent);
@@ -1209,11 +1198,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 			print "<table class=\"table\">";
 			print "<thead>\n<tr>\n";
-			print "<th width='10%'></th>\n";
-			print "<th width='30%'>".getMLText("file")."</th>\n";
-//			print "<th width='25%'>".getMLText("comment")."</th>\n";
-			print "<th width='15%'>".getMLText("status")."</th>\n";
-			print "<th width='20%'></th>\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";
 
 			for ($i = count($versions)-2; $i >= 0; $i--) {
@@ -1226,7 +1213,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$file_exists=file_exists($dms->contentDir . $version->getPath());
 
 				print "<tr>\n";
-				print "<td nowrap>";
+				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
 				if($file_exists) {
 					if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes)) {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
@@ -1245,7 +1232,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 				print "</td>\n";
 				print "<td><ul class=\"unstyled\">\n";
-				print "<li>".$version->getOriginalFileName()."</li>\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>";
 				else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
@@ -1398,11 +1385,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$targetDoc = $link->getTarget();
 				$targetlc = $targetDoc->getLatestContent();
 
-				$previewer->createPreview($targetlc, $previewwidthlist);
+				$previewer->createPreview($targetlc, $previewwidthdetail);
 				print "<tr>";
-				print "<td><a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
+				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
+				print "<a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
 				if($previewer->hasPreview($targetlc)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\"src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				} else {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				}
@@ -1469,11 +1457,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$sourceDoc = $link->getDocument();
 				$sourcelc = $sourceDoc->getLatestContent();
 
-				$previewer->createPreview($sourcelc, $previewwidthlist);
+				$previewer->createPreview($sourcelc, $previewwidthdetail);
 				print "<tr>";
-				print "<td><a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
+				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
+				print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
 				if($previewer->hasPreview($sourcelc)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\"src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
 				} else {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
 				}