diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala
index e5d8085..ac915b2 100644
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -80,15 +80,10 @@
   })
 
   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 @@
     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 adb2de1..25cda19 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/plugins.scala.html b/src/main/twirl/admin/plugins.scala.html
deleted file mode 100644
index bfa2a4c..0000000
--- a/src/main/twirl/admin/plugins.scala.html
+++ /dev/null
@@ -1,34 +0,0 @@
-@(plugins: List[plugin.Plugin])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Plugins"){
-  @menu("plugins"){
-    <form action="@path/admin/plugins/_delete" method="POST" validate="true">
-      <table class="table table-bordered">
-        <tr>
-          <th>ID</th>
-          <th>Provider</th>
-          <th>Description</th>
-        </tr>
-        @plugins.zipWithIndex.map { case (plugin, i) =>
-          <tr>
-            <td>
-              <input type="checkbox" name="pluginId[@i]" value="@plugin.id"/>
-              @plugin.id
-            </td>
-            <td><a href="@plugin.url">@plugin.author</a></td>
-            <td>@plugin.description</td>
-          </tr>
-        }
-      </table>
-      <input type="submit" id="delete-plugins" class="btn btn-danger" value="Uninstall selected plugins"/>
-    </form>
-  }
-}
-<script>
-$(function(){
-  $('#delete-plugins').click(function(){
-    return confirm('Selected plugin will be removed permanently. Are you sure?');
-  });
-});
-</script>
diff --git a/src/main/twirl/admin/plugins/console.scala.html b/src/main/twirl/admin/plugins/console.scala.html
new file mode 100644
index 0000000..f594bf9
--- /dev/null
+++ b/src/main/twirl/admin/plugins/console.scala.html
@@ -0,0 +1,37 @@
+@()(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("JavaScript Console"){
+  @admin.html.menu("plugins"){
+    @tab("console")
+    <form method="POST">
+      <div class="box">
+        <div class="box-header">JavaScript Console</div>
+        <div class="box-content">
+          <div id="editor" style="width: 100%; height: 400px;"></div>
+        </div>
+      </div>
+      <fieldset>
+        <input type="button" id="evaluate" class="btn btn-success" value="Evaluate"/>
+      </fieldset>
+    </form>
+  }
+}
+<script src="@assets/ace/ace.js" type="text/javascript" charset="utf-8"></script>
+<script>
+$(function(){
+  var editor = ace.edit("editor");
+  editor.setTheme("ace/theme/monokai");
+  editor.getSession().setMode("ace/mode/javascript");
+
+  $('#evaluate').click(function(){
+    $.post('@path/admin/plugins/console', {
+      script: editor.getValue()
+    }, function(data){
+      alert('Success: ' + data);
+    }).fail(function(error){
+      alert(error.statusText);
+    });
+  });
+});
+</script>
\ No newline at end of file
diff --git a/src/main/twirl/admin/plugins/installed.scala.html b/src/main/twirl/admin/plugins/installed.scala.html
new file mode 100644
index 0000000..7a0fa6b
--- /dev/null
+++ b/src/main/twirl/admin/plugins/installed.scala.html
@@ -0,0 +1,35 @@
+@(plugins: List[plugin.Plugin])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Plugins"){
+  @admin.html.menu("plugins"){
+    @tab("installed")
+    <form action="@path/admin/plugins/_delete" method="POST" validate="true">
+      <table class="table table-bordered">
+        <tr>
+          <th>ID</th>
+          <th>Provider</th>
+          <th>Description</th>
+        </tr>
+        @plugins.zipWithIndex.map { case (plugin, i) =>
+          <tr>
+            <td>
+              <input type="checkbox" name="pluginId[@i]" value="@plugin.id"/>
+              @plugin.id
+            </td>
+            <td><a href="@plugin.url">@plugin.author</a></td>
+            <td>@plugin.description</td>
+          </tr>
+        }
+      </table>
+      <input type="submit" id="delete-plugins" class="btn btn-danger" value="Uninstall selected plugins"/>
+    </form>
+  }
+}
+<script>
+$(function(){
+  $('#delete-plugins').click(function(){
+    return confirm('Selected plugin will be removed permanently. Are you sure?');
+  });
+});
+</script>
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 0000000..34d9056
--- /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>
diff --git a/src/main/twirl/admin/script.scala.html b/src/main/twirl/admin/script.scala.html
deleted file mode 100644
index e3997b8..0000000
--- a/src/main/twirl/admin/script.scala.html
+++ /dev/null
@@ -1,36 +0,0 @@
-@()(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("JavaScript Console"){
-  @menu("script"){
-    <form method="POST">
-      <div class="box">
-        <div class="box-header">JavaScript Console</div>
-        <div class="box-content">
-          <div id="editor" style="width: 100%; height: 400px;"></div>
-        </div>
-      </div>
-      <fieldset>
-        <input type="button" id="evaluate" class="btn btn-success" value="Evaluate"/>
-      </fieldset>
-    </form>
-  }
-}
-<script src="@assets/ace/ace.js" type="text/javascript" charset="utf-8"></script>
-<script>
-$(function(){
-  var editor = ace.edit("editor");
-  editor.setTheme("ace/theme/monokai");
-  editor.getSession().setMode("ace/mode/javascript");
-
-  $('#evaluate').click(function(){
-    $.post('@path/admin/script', {
-      script: editor.getValue()
-    }, function(data){
-      alert('Success: ' + data);
-    }).fail(function(error){
-      alert(error.statusText);
-    });
-  });
-});
-</script>
\ No newline at end of file