diff --git a/public/less/admin/extend/plugins.less b/public/less/admin/extend/plugins.less
index a8b71ab275..cc2c264920 100644
--- a/public/less/admin/extend/plugins.less
+++ b/public/less/admin/extend/plugins.less
@@ -7,6 +7,7 @@
 		padding: 1em;
 		margin-bottom: 5px;
 		border-left: 5px solid #08c;
+		margin-left: -40px;
 
 		h2 {
 			font-size: 16px;
diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl
index 460d324618..66245e26bc 100644
--- a/src/views/admin/extend/plugins.tpl
+++ b/src/views/admin/extend/plugins.tpl
@@ -1,42 +1,75 @@
-<h1><i class="fa fa-code-fork"></i> Plugins</h1>
+<div class="plugins">
+	<div class="col-sm-9">
+		<div class="panel panel-default">
+			<div class="panel-heading"><i class="fa fa-code-fork"></i> Installed Plugins</div>
+			<div class="panel-body">
+				<ul>
+					<!-- BEGIN plugins -->
+					<!-- IF plugins.installed -->
+					<li data-plugin-id="{plugins.id}" class="clearfix">
+						<div class="pull-right">
+							<button data-action="toggleActive" class="btn <!-- IF plugins.active --> btn-warning<!-- ELSE --> btn-success<!-- ENDIF plugins.active -->"><i class="fa fa-power-off"></i> <!-- IF plugins.active -->Deactivate<!-- ELSE -->Activate<!-- ENDIF plugins.active --></button>
 
-<div class="alert alert-warning">
-	<p>
-		<strong>Interested in writing plugins for NodeBB?</strong>
-	</p>
-	<p>
-		Full documentation regarding plugin authoring can be found in the <a target="_blank" href="https://docs.nodebb.org/en/latest/plugins/create.html">NodeBB Wiki</a>.
-	</p>
-</div>
+							<button data-action="toggleInstall" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
+						</div>
 
-<input class="form-control" type="text" id="plugin-search" placeholder="Search plugins"/>
-<br/>
+						<h2><strong>{plugins.name}</strong></h2>
 
-<ul class="plugins">
-	<!-- BEGIN plugins -->
-	<li data-plugin-id="{plugins.id}" class="clearfix">
-		<div class="pull-right">
+						<!-- IF plugins.description -->
+						<p>{plugins.description}</p>
+						<!-- ENDIF plugins.description -->
+						<!-- IF plugins.url -->
+						<p>For more information: <a href="{plugins.url}">{plugins.url}</a></p>
+						<!-- ENDIF plugins.url -->
+					</li>
+					<!-- ENDIF plugins.installed -->
+					<!-- END plugins -->
+				</ul>
+			</div>
+		</div>
 
-			<button data-action="toggleActive" class="btn <!-- IF plugins.active --> btn-warning<!-- ELSE --> btn-success<!-- ENDIF plugins.active --><!-- IF !plugins.installed --> hide<!-- ENDIF !plugins.installed -->"><i class="fa fa-power-off"></i> <!-- IF plugins.active -->Deactivate<!-- ELSE -->Activate<!-- ENDIF plugins.active --></button>
+		<div class="panel panel-default">
+			<div class="panel-heading"><i class="fa fa-code-fork"></i> Download Plugins</div>
+			<div class="panel-body">
+				<ul>
+					<!-- BEGIN plugins -->
+					<!-- IF !plugins.installed -->
+					<li data-plugin-id="{plugins.id}" class="clearfix">
+						<div class="pull-right">
+							<button data-action="toggleInstall" class="btn btn-success"><i class="fa fa-download"></i> Install</button>
+						</div>
 
+						<h2><strong>{plugins.name}</strong></h2>
 
-			<!-- IF plugins.installed -->
-			<button data-action="toggleInstall" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
-			<!-- ELSE -->
-			<button data-action="toggleInstall" class="btn btn-success"><i class="fa fa-download"></i> Install</button>
-			<!-- ENDIF plugins.installed -->
+						<!-- IF plugins.description -->
+						<p>{plugins.description}</p>
+						<!-- ENDIF plugins.description -->
+						<!-- IF plugins.url -->
+						<p>For more information: <a href="{plugins.url}">{plugins.url}</a></p>
+						<!-- ENDIF plugins.url -->
+					</li>
+					<!-- ENDIF !plugins.installed -->
+					<!-- END plugins -->
+				</ul>
+			</div>
 		</div>
+	</div>
 
-		<h2><strong>{plugins.name}</strong></h2>
-
-		<!-- IF plugins.description -->
-		<p>{plugins.description}</p>
-		<!-- ENDIF plugins.description -->
-		<!-- IF plugins.url -->
-		<p>For more information: <a href="{plugins.url}">{plugins.url}</a></p>
-		<!-- ENDIF plugins.url -->
-	</li>
-	<!-- END plugins -->
-</ul>
-
+	<div class="col-lg-3">
+		<div class="panel panel-default">
+			<div class="panel-heading">Plugin Search</div>
+			<div class="panel-body">
+				<input class="form-control" type="text" id="plugin-search" placeholder="Search for plugin..."/>
+			</div>
+		</div>
 
+		<div class="panel panel-default">
+			<div class="panel-heading">Interested in writing plugins for NodeBB?</div>
+			<div class="panel-body">
+				<p>
+					Full documentation regarding plugin authoring can be found in the <a target="_blank" href="https://docs.nodebb.org/en/latest/plugins/create.html">NodeBB Wiki</a>.
+				</p>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file