diff --git a/lib/GUI/index.handlebars b/lib/GUI/index.handlebars
index caea22874..658b9f740 100644
--- a/lib/GUI/index.handlebars
+++ b/lib/GUI/index.handlebars
@@ -18,10 +18,11 @@
 			npm adduser --registry {{ baseUrl }}
 		</code>
 
-		{{#each locals}}
+		{{#each packages}}
 			<article>
-				<h2>{{ name }} <small>v{{ version }}</small></h2>
-				<div>By: {{ _npmUser.name }}</div>
+				<h3>{{ name }} <small>v{{ version }}</small></h3>
+				<div>User: {{ _npmUser.name }}</div>
+				<p>{{ description }}</p>
 			</article>
 		{{/each}}
 	</body>
diff --git a/lib/index.js b/lib/index.js
index 5ca651ed5..b331650aa 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -127,27 +127,13 @@ module.exports = function(config_hash) {
 	app.get('/', can('access'), function(req, res, next) {
 		res.setHeader('Content-Type', 'text/html');
 
-		var locals = localList.get();
-		var getPackage = function(i) {
-			storage.get_package(locals[i], function(err, info) {
-				var latest = info['dist-tags'].latest;
-
-				locals[i] = info.versions[latest];
-
-				if(i < locals.length - 1) {
-					getPackage(i + 1);
-				}
-				else {
-					res.send(template({
-						name:   "Sinopia",
-						locals: locals,
-						baseUrl:    req.protocol + '://' + req.get('host') + '/'
-					}));
-				}
-			})
-		}
-
-		getPackage(0);
+		storage.get_local(function(err, packages) {
+			res.send(template({
+				name:   	"Sinopia",
+				packages: 	packages,
+				baseUrl:  	req.protocol + '://' + req.get('host') + '/'
+			}));
+		});
 	});
 
 	// TODO: anonymous user?
@@ -215,13 +201,6 @@ module.exports = function(config_hash) {
 		})
 	})
 
-	app.put('/-/user/:org_couchdb_user', function(req, res, next) {
-		res.status(409)
-		return res.send({
-			error: 'registration is not implemented',
-		})
-	})
-
 	app.put('/-/user/:org_couchdb_user/-rev/*', function(req, res, next) {
 		if (req.remoteUser == null) {
 			res.status(403)
diff --git a/lib/local-list.js b/lib/local-list.js
index 46678b64b..d9eed3f4c 100644
--- a/lib/local-list.js
+++ b/lib/local-list.js
@@ -1,5 +1,5 @@
-var fs = require('fs'),
-	listFilePath = './local-list.json';
+var fs = require('fs')
+  , listFilePath = './local-list.json';
 
 var LocalList = function() {
 	if(fs.existsSync(listFilePath)) {
diff --git a/lib/storage.js b/lib/storage.js
index 3c9973f59..dd238ac2f 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -6,6 +6,7 @@ var async = require('async')
   , mystreams = require('./streams')
   , utils = require('./utils')
   , Logger = require('./logger')
+  , localList = require('./local-list');
 
 //
 // Implements Storage interface
@@ -320,6 +321,29 @@ Storage.prototype.get_package = function(name, options, callback) {
 	})
 }
 
+Storage.prototype.get_local = function(callback) {
+	var self = this
+	  , locals = localList.get()
+	  , packages = [];
+
+	var getPackage = function(i) {
+		self.get_package(locals[i], function(err, info) {
+			var latest = info['dist-tags'].latest;
+
+			packages.push(info.versions[latest]);
+
+			if(err || i >= locals.length - 1) {
+				callback(err, packages);
+			}
+			else {
+				getPackage(i + 1);
+			}
+		});
+	};
+
+	getPackage(0);
+};
+
 // function fetches package information from uplinks and synchronizes it with local data
 // if package is available locally, it MUST be provided in pkginfo
 // returns callback(err, result, uplink_errors)
diff --git a/package.json b/package.json
index 43414f718..35f28cf45 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "express": "3.4.x",
     "handlebars": "^2.0.0-alpha.2",
     "js-yaml": ">= 3.0.1",
+    "lunr": "^0.5.2",
     "minimatch": ">= 0.2.14",
     "mkdirp": ">= 0.3.5",
     "request": ">= 2.31.0",