home page fixes
diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js
index ebd3da1..63a075c 100644
--- a/erpnext/home/page/desktop/desktop.js
+++ b/erpnext/home/page/desktop/desktop.js
@@ -43,61 +43,50 @@
 }
 
 erpnext.desktop.render = function() {
-	var icons = [
-		{ gradient: 'blue', sprite: 'account', label: 'Accounts', link: '#!accounts-home',
-			is_module: 'Accounts'},
-		{ gradient: 'green', sprite: 'selling', label: 'Selling', link: '#!selling-home',
-			is_module: 'Selling'},
-		{ gradient: 'yellow', sprite: 'stock', label: 'Stock', link: '#!stock-home',
-			is_module: 'Stock'},
-		{ gradient: 'red', sprite: 'buying', label: 'Buying', link: '#!buying-home',
-			is_module: 'Buying'},
-		{ gradient: 'purple', sprite: 'support', label: 'Support', link: '#!support-home',	
-			is_module: 'Support'},
-		{ gradient: 'ocean', sprite: 'hr', label: 'Human<br />Resources', link: '#!hr-home',
-			is_module: 'HR'},
-		{ gradient: 'violet', sprite: 'project', label: 'Projects', link: '#!projects-home',
-			is_module: 'Projects'},
-		{ gradient: 'dark-red', sprite: 'production', label: 'Production', link: '#!production-home',
-			is_module: 'Production'},
-		{ gradient: 'leaf-green', sprite: 'website', label: 'Website', link: '#!website-home',
-			is_module: 'Website'},
-	]
+	var icons = {
+		'Accounts': { gradient: 'blue', sprite: 'account', label: 'Accounts'},
+		'Selling': { gradient: 'green', sprite: 'selling', label: 'Selling'},
+		'Stock': { gradient: 'yellow', sprite: 'stock', label: 'Stock'},
+		'Buying': { gradient: 'red', sprite: 'buying', label: 'Buying'},
+		'Support': { gradient: 'purple', sprite: 'support', label: 'Support'},
+		'HR': { gradient: 'ocean', sprite: 'hr', label: 'Human<br />Resources'},
+		'Projects':	{ gradient: 'violet', sprite: 'project', label: 'Projects'},
+		'Production': { gradient: 'dark-red', sprite: 'production', label: 'Production'},
+		'Website': { gradient: 'leaf-green', sprite: 'website', label: 'Website'},
+		'Activity': { gradient: 'brown', sprite: 'feed', label: 'Activity'},
+		'Setup': { gradient: 'grey', sprite: 'setting', label: 'Setup'},
+		'Dashboard': { gradient: 'bright-green', sprite: 'dashboard', label: 'Dashboard'},
+		'To Do': { gradient: 'bright-yellow', sprite: 'todo', label: 'To Do'},
+		'Messages': { gradient: 'pink', sprite: 'messages', label: 'Messages'},
+		'Calendar': { gradient: 'peacock', sprite: 'calendar', label: 'Calendar'},
+		'Knowledge Base': { gradient: 'ultra-dark-green', sprite: 'kb', label: 'Knowledge<br />Base'}
+	}
+	
 
-	var add_icon = function(v) {
+	var add_icon = function(m) {
+		var icon = icons[m];
+		icon.link = erpnext.modules[m];
 		$('#icon-grid').append(repl('\
-			<div id="%(sprite)s" class="case-wrapper"><a href="%(link)s">\
+			<div id="%(sprite)s" class="case-wrapper"><a href="#!%(link)s">\
 				<div class="case-border case-%(gradient)s">\
 					<div class="sprite-image sprite-%(sprite)s"></div>\
 				</div></a>\
 				<div class="case-label">%(label)s</div>\
-			</div>', v));		
+			</div>', icon));		
 	}
 	
-	var get_module = function(m) {
-		for(var i in icons) {
-			if(icons[i].is_module==m) return icons[i]
-		}
-	}
-	
-	// activity
-	add_icon({ gradient: 'brown', sprite: 'feed', label: 'Activity', link: '#!Event Updates'});
-
-	// modules
-	for(var i in wn.boot.modules_list)
-		add_icon(get_module(wn.boot.modules_list[i]));
-
 	// setup
+
+	for(var i in wn.boot.modules_list) {
+		var m = wn.boot.modules_list[i];
+		if(m!='Setup');
+			add_icon(m);
+	}
+
 	if(user_roles.indexOf('System Manager')!=-1)
-		add_icon({ gradient: 'grey', sprite: 'setting', label: 'Setup', link: '#!Setup' });
+		add_icon('Setup')
 
 	// apps
-	add_icon({ gradient: 'bright-green', sprite: 'dashboard', label: 'Dashboard', link: '#!dashboard' });
-	add_icon({ gradient: 'bright-yellow', sprite: 'todo', label: 'To Do', link: '#!todo' });
-	add_icon({ gradient: 'pink', sprite: 'messages', label: 'Messages', link: '#!messages' });
-	add_icon({ gradient: 'peacock', sprite: 'calendar', label: 'Calendar', link: '#!calendar' });
-	add_icon({ gradient: 'ultra-dark-green', sprite: 'kb', label: 'Knowledge<br />Base', link: '#!questions' });
-	
 	erpnext.desktop.show_pending_notifications();
 
 }