diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala
index e5d8085ff..ac915b2a2 100644
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -80,15 +80,10 @@ trait SystemSettingsControllerBase extends ControllerBase {
   })
 
   get("/admin/plugins")(adminOnly {
-    admin.html.plugins(plugin.PluginSystem.plugins)
+    admin.plugins.html.installed(plugin.PluginSystem.plugins)
   })
 
   post("/admin/plugins/_delete", pluginForm)(adminOnly { form =>
-    // TODO uninstall and delete plugins
-    println("****")
-    println(form.pluginIds)
-    println("****")
-
     form.pluginIds.foreach { pluginId =>
       plugin.PluginSystem.uninstall(pluginId)
       val dir = new java.io.File(PluginHome, pluginId)
@@ -99,11 +94,11 @@ trait SystemSettingsControllerBase extends ControllerBase {
     redirect("/admin/plugins")
   })
 
-  get("/admin/script")(adminOnly {
-    admin.html.script()
+  get("/admin/plugins/console")(adminOnly {
+    admin.plugins.html.console()
   })
 
-  post("/admin/script")(adminOnly {
+  post("/admin/plugins/console")(adminOnly {
     val script = request.getParameter("script")
     val result = plugin.JavaScriptPlugin.evaluateJavaScript(script)
     Ok(result)
diff --git a/src/main/twirl/admin/menu.scala.html b/src/main/twirl/admin/menu.scala.html
index adb2de1d9..25cda196d 100644
--- a/src/main/twirl/admin/menu.scala.html
+++ b/src/main/twirl/admin/menu.scala.html
@@ -14,9 +14,6 @@
           <li@if(active=="plugins"){ class="active"}>
             <a href="@path/admin/plugins">Plugins</a>
           </li>
-          <li@if(active=="script"){ class="active"}>
-            <a href="@path/admin/script">JavaScript Console</a>
-          </li>
           <li>
             <a href="@path/console/login.jsp">H2 Console</a>
           </li>
diff --git a/src/main/twirl/admin/script.scala.html b/src/main/twirl/admin/plugins/console.scala.html
similarity index 90%
rename from src/main/twirl/admin/script.scala.html
rename to src/main/twirl/admin/plugins/console.scala.html
index e3997b876..f594bf978 100644
--- a/src/main/twirl/admin/script.scala.html
+++ b/src/main/twirl/admin/plugins/console.scala.html
@@ -2,7 +2,8 @@
 @import context._
 @import view.helpers._
 @html.main("JavaScript Console"){
-  @menu("script"){
+  @admin.html.menu("plugins"){
+    @tab("console")
     <form method="POST">
       <div class="box">
         <div class="box-header">JavaScript Console</div>
@@ -24,7 +25,7 @@ $(function(){
   editor.getSession().setMode("ace/mode/javascript");
 
   $('#evaluate').click(function(){
-    $.post('@path/admin/script', {
+    $.post('@path/admin/plugins/console', {
       script: editor.getValue()
     }, function(data){
       alert('Success: ' + data);
diff --git a/src/main/twirl/admin/plugins.scala.html b/src/main/twirl/admin/plugins/installed.scala.html
similarity index 94%
rename from src/main/twirl/admin/plugins.scala.html
rename to src/main/twirl/admin/plugins/installed.scala.html
index bfa2a4cd5..7a0fa6be9 100644
--- a/src/main/twirl/admin/plugins.scala.html
+++ b/src/main/twirl/admin/plugins/installed.scala.html
@@ -2,7 +2,8 @@
 @import context._
 @import view.helpers._
 @html.main("Plugins"){
-  @menu("plugins"){
+  @admin.html.menu("plugins"){
+    @tab("installed")
     <form action="@path/admin/plugins/_delete" method="POST" validate="true">
       <table class="table table-bordered">
         <tr>
diff --git a/src/main/twirl/admin/plugins/tab.scala.html b/src/main/twirl/admin/plugins/tab.scala.html
new file mode 100644
index 000000000..34d9056e1
--- /dev/null
+++ b/src/main/twirl/admin/plugins/tab.scala.html
@@ -0,0 +1,7 @@
+@(active: String)(implicit context: app.Context)
+@import context._
+<ul class="nav nav-tabs">
+  <li@if(active == "installed"){ class="active"}><a href="@path/admin/plugins">Installed plugins</a></li>
+  <li@if(active == "available"){ class="active"}><a href="@path/admin/plugins">Available plugins</a></li>
+  <li@if(active == "console"  ){ class="active"}><a href="@path/admin/plugins/console">JavaScript console</a></li>
+</ul>