diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php
index 119f85f10..88c118c5f 100644
--- a/views/bootstrap/class.Info.php
+++ b/views/bootstrap/class.Info.php
@@ -13,11 +13,6 @@
  * @version    Release: @package_version@
  */
 
-/**
- * Include parent class
- */
-//require_once("class.Bootstrap.php");
-
 /**
  * Class which outputs the html page for Info view
  *
@@ -60,17 +55,30 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
 		$this->rowStart();
 		$this->columnStart(6);
 		$this->contentHeading(getMLText("seeddms_info"));
-		$seedextensions = $extmgr->getExtensionConfiguration();
 		echo "<table class=\"table table-condensed table-sm\">\n";
 		echo "<thead>\n<tr>\n";
-		echo "<th></th>";
-		echo "<th>".getMLText("name");
-		echo "</th>\n";
+		echo "<th>".getMLText("name")."</th>\n";
 		echo "</tr>\n</thead>\n<tbody>\n";
 		$dbversion = $dms->getDBVersion();
-		echo "<tr><td></td><td></td><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
+		echo "<tr><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
 		if($user->isAdmin()) {
-			echo "<tr><td></td><td></td><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
+			$storage = $dms->getStorage();
+			echo "<tr><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
+			echo "<tr></td><td>".getMLText('storage')."</td><td>".($storage ? $storage->info() : "legacy")."</td></tr>\n";
+		}
+		echo "</tbody>\n</table>\n";
+
+		if($user->isAdmin()) {
+			$this->contentHeading(getMLText("extension_info"));
+			echo "<table class=\"table table-condensed table-sm\">\n";
+			echo "<thead>\n<tr>\n";
+			echo "<th></th>";
+			echo "<th></th>";
+			echo "<th>".getMLText("name");
+			echo "<th>".getMLText("version")."</th>\n";
+			echo "</th>\n";
+			echo "</tr>\n</thead>\n<tbody>\n";
+			$seedextensions = $extmgr->getExtensionConfiguration();
 			foreach($seedextensions as $extname=>$extconf) {
 				echo "<tr><td>";
 				if(!$settings->extensionIsDisabled($extname))
@@ -85,8 +93,8 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
 				echo "<td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td>";
 				echo "</tr>\n";
 			}
+			echo "</tbody>\n</table>\n";
 		}
-		echo "</tbody>\n</table>\n";
 		$this->columnEnd();
 		$this->columnStart(6);
 		if($user->isAdmin()) {