diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl
index 3e6a6b541e..3d90e6813c 100644
--- a/src/views/admin/advanced/database.tpl
+++ b/src/views/admin/advanced/database.tpl
@@ -1,13 +1,13 @@
+<!-- IF error -->
+<div class="alert alert-warning">
+	{error.friendlyMessage}
+	<hr />
+	<code>{error.errmsg}</code>
+</div>
+<!-- END -->
 <div class="row database">
-	<div class="col-sm-9">
-		<!-- IF error -->
-		<div class="alert alert-warning">
-			{error.friendlyMessage}
-			<hr />
-			<code>{error.errmsg}</code>
-		</div>
-		<!-- END -->
-		<!-- IF mongo -->
+	{{{ if mongo }}}
+	<div class="col-lg-6">
 		<div class="panel panel-default">
 			<div class="panel-heading"><i class="fa fa-hdd-o"></i> [[admin/advanced/database:mongo]]</div>
 			<div class="panel-body">
@@ -37,9 +37,11 @@
 				</div>
 			</div>
 		</div>
-		<!-- ENDIF mongo -->
+	</div>
+	{{{ end }}}
 
-		<!-- IF redis -->
+	{{{ if redis }}}
+	<div class="col-lg-6">
 		<div class="panel panel-default">
 			<div class="panel-heading"><i class="fa fa-hdd-o"></i> [[admin/advanced/database:redis]]</div>
 			<div class="panel-body">
@@ -75,9 +77,11 @@
 				</div>
 			</div>
 		</div>
-		<!-- ENDIF redis -->
+	</div>
+	{{{ end }}}
 
-		<!-- IF postgres -->
+	{{{ if postgres }}}
+	<div class="col-lg-6">
 		<div class="panel panel-default">
 			<div class="panel-heading"><i class="fa fa-hdd-o"></i> [[admin/advanced/database:postgres]]</div>
 			<div class="panel-body">
@@ -88,9 +92,13 @@
 				</div>
 			</div>
 		</div>
-		<!-- ENDIF postgres -->
+	</div>
+	{{{ end }}}
+</div>
 
-		<!-- IF mongo -->
+<div class="row database">
+	{{{ if mongo }}}
+	<div class="col-lg-6">
 		<div class="panel panel-default">
 			<div class="panel-heading" data-toggle="collapse" data-target=".mongodb-raw">
 				<h3 class="panel-title"><i class="fa fa-caret-down"></i> [[admin/advanced/database:mongo.raw-info]]</h3>
@@ -102,9 +110,11 @@
 				</div>
 			</div>
 		</div>
-		<!-- ENDIF mongo -->
+	</div>
+	{{{ end }}}
 
-		<!-- IF redis -->
+	{{{ if redis }}}
+	<div class="col-lg-6">
 		<div class="panel panel-default">
 			<div class="panel-heading" data-toggle="collapse" data-target=".redis-raw">
 				<h3 class="panel-title"><i class="fa fa-caret-down"></i> [[admin/advanced/database:redis.raw-info]]</h3>
@@ -116,9 +126,11 @@
 				</div>
 			</div>
 		</div>
-		<!-- ENDIF redis -->
+	</div>
+	{{{ end }}}
 
-		<!-- IF postgres -->
+	{{{ if postgres }}}
+	<div class="col-lg-6">
 		<div class="panel panel-default">
 			<div class="panel-heading" data-toggle="collapse" data-target=".postgresql-raw">
 				<h3 class="panel-title"><i class="fa fa-caret-down"></i> [[admin/advanced/database:postgres.raw-info]]</h3>
@@ -130,6 +142,6 @@
 				</div>
 			</div>
 		</div>
-		<!-- ENDIF postgres -->
 	</div>
+	{{{ end }}}
 </div>