diff --git a/public/index.html b/public/index.html
index f8c4180..59077a2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -424,11 +424,21 @@ function updateViewModelMain(app, viewModel, doc, vm_config) {
     addComputed(snapshot);
     debug && console.log('updating viewModel', snapshot, viewModel, vm_config);
     ko.mapping.fromJS(snapshot, vm_config.mapping, viewModel);
-    viewModel._newAttribute("");
     debug && console.log('updated viewModel', viewModel);
+    viewModel._newAttribute("");
     mainViewModelUpdating = false;
 }
 
+var navigationViewModelUpdating = false;
+function updateViewModelNavigation(app, viewModel, doc, vm_config) {
+    navigationViewModelUpdating = true;
+    var snapshot = doc.snapshot;
+    debug && console.log('updating viewModel', snapshot, viewModel, vm_config);
+    ko.mapping.fromJS(snapshot, vm_config.mapping, viewModel);
+    debug && console.log('updated viewModel', viewModel);
+    navigationViewModelUpdating = false;
+}
+
 
 /* crazy expensive caching tree traverse */
 function traverse(current, field, property, depth, pos) {
@@ -491,7 +501,7 @@ function updateViewModel(app, viewModels, key, doc, vm_config) {
         updateViewModelMain(app, viewModels[key], doc, vm_config);
     }
     if (key == 'navigation') {
-        // updateViewModelMain(app, viewModels[key], doc, mapping);
+        updateViewModelNavigation(app, viewModels[key], doc, vm_config);
     }
 }
 
diff --git a/public/templates/navigation.json b/public/templates/navigation.json
index d653e38..06ca175 100644
--- a/public/templates/navigation.json
+++ b/public/templates/navigation.json
@@ -1,5 +1,5 @@
 {
-	"default_icon": "icon-eye-open",
+	"default_icon": "icon-home",
 	"links": [
 		{
 			"title": "Prototyper",
@@ -70,7 +70,8 @@
 								},
 								{
 									"title": "Documentation",
-									"url": "http://knockoutjs.com/documentation/introduction.html"
+									"url": "http://knockoutjs.com/documentation/introduction.html",
+									"icon_class": "icon-book"
 								},
 								{
 									"title": "Mapping Plugin",
@@ -92,7 +93,8 @@
 						},
 						{
 							"title": "Underscore",
-							"url": "http://underscorejs.org/"
+							"url": "http://underscorejs.org/",
+							"icon_class": "icon-home"
 						},
 						{
 							"title": "ACE",
@@ -113,7 +115,8 @@
 								},
 								{
 									"title": "API",
-									"url": "http://nodejs.org/api/"
+									"url": "http://nodejs.org/api/",
+									"icon_class": "icon-book"
 								}
 							]
 						},
@@ -127,7 +130,8 @@
 								},
 								{
 									"title": "API",
-									"url": "http://expressjs.com/api.html"
+									"url": "http://expressjs.com/api.html",
+									"icon_class": "icon-book"
 								}
 							]
 						},
@@ -136,17 +140,20 @@
 							"links": [
 								{
 									"title": "MongoDB Manual",
-									"url": "http://docs.mongodb.org/manual/contents/"
+									"url": "http://docs.mongodb.org/manual/contents/",
+									"icon_class": "icon-book"
 								},
 								{
 									"title": "MongoDB Node.JS Driver",
-									"url": "http://mongodb.github.io/node-mongodb-native/contents.html"
+									"url": "http://mongodb.github.io/node-mongodb-native/contents.html",
+									"icon_class": "icon-book"
 								}
 							]
 						},
 						{
 							"title": "ShareJS",
-							"url": "https://github.com/josephg/ShareJS/wiki"
+							"url": "https://github.com/josephg/ShareJS/wiki",
+							"icon_class": "icon-book"
 						},
 						{
 							"title": "Underscore",