diff --git a/Mongoman/Gemfile b/Mongoman/Gemfile
index 317a512..9f06c0b 100644
--- a/Mongoman/Gemfile
+++ b/Mongoman/Gemfile
@@ -52,5 +52,7 @@ gem 'genghisapp'
 
 gem 'bson_ext'
 
+gem 'multi_json', '1.7.8'
+
 gem 'jquery-ui-rails'
 
diff --git a/Mongoman/app/assets/javascripts/controllers/start_controller.js b/Mongoman/app/assets/javascripts/controllers/start_controller.js
index 118f27b..66230fc 100644
--- a/Mongoman/app/assets/javascripts/controllers/start_controller.js
+++ b/Mongoman/app/assets/javascripts/controllers/start_controller.js
@@ -1,15 +1,10 @@
 Mongoman.StartController = Ember.ArrayController.extend({
-	content: null,
-	isVisible: true,
+  content: null,
+  isLoaded: Ember.computed.alias('content.length'),
 
-	update: function() {
-		this.set('content',this.get('content'));
-    if (this.get('content')) {
-      this.set('content.isLoaded', true);
-    }
-	}.observes('content'),
 
   actions: {
+
     addDatabase: function() {
       var self = this;
       $("#newdb-create" ).dialog({
@@ -22,12 +17,10 @@ Mongoman.StartController = Ember.ArrayController.extend({
             var newDbName = self.get('content.newDbName')
             var url = '/databases?'
             Mongoman.PostRequest.post(url, {dbname: newDbName}, 'POST')
-            $(this).dialog("close") 
-            self.set('content.isLoaded', false);
-            //self.set('content', Mongoman.Request.find("/databases",'databases'))            
+            $(this).dialog("close")
           },
           Cancel: function() {
-            $(this).dialog("close") 
+            $(this).dialog("close")
           }
         }
       });
@@ -38,4 +31,4 @@ Mongoman.StartController = Ember.ArrayController.extend({
 
 
 
-})
\ No newline at end of file
+})
diff --git a/Mongoman/app/assets/javascripts/models/request.js b/Mongoman/app/assets/javascripts/models/request.js
index a4422dd..78b5df8 100644
--- a/Mongoman/app/assets/javascripts/models/request.js
+++ b/Mongoman/app/assets/javascripts/models/request.js
@@ -4,7 +4,7 @@ Mongoman.Request = Ember.Object.extend({
 
 Mongoman.Request.reopenClass({
 
-  find: function makePromise(url) {
+  find: function getData(url) {
     var promise = new Ember.RSVP.Promise(function(resolve, reject) {
         Ember.$.ajax({
           dataType: "json",
diff --git a/Mongoman/app/assets/javascripts/routes/app_router.js b/Mongoman/app/assets/javascripts/routes/app_router.js
index a2862c7..2c12906 100644
--- a/Mongoman/app/assets/javascripts/routes/app_router.js
+++ b/Mongoman/app/assets/javascripts/routes/app_router.js
@@ -1,5 +1,5 @@
 Mongoman.Router.map(function() {
-	
+
 	this.route('start', {path: '/'});
 	this.route('about', {path: '/about'});
 	this.route('collections',{path: '/collections/:name'});
@@ -8,5 +8,5 @@ Mongoman.Router.map(function() {
 
 
 
-	
-});
\ No newline at end of file
+
+});
diff --git a/Mongoman/app/assets/javascripts/routes/collections_route.js b/Mongoman/app/assets/javascripts/routes/collections_route.js
index 73c118d..944aa09 100644
--- a/Mongoman/app/assets/javascripts/routes/collections_route.js
+++ b/Mongoman/app/assets/javascripts/routes/collections_route.js
@@ -9,18 +9,16 @@ Mongoman.CollectionsRoute = Ember.Route.extend({
 
 	setupController: function(controller,model) {
 		controller.set('content', model.collections)
-		controller.set('content.isLoaded',false)
 		controller.set('content.count', model.count)
-		controller.set('content.isLoaded',true)
 	},
 
-	renderTemplate: function() {
+	/*renderTemplate: function() {
 		this.render('collections', {outlet: "main" , into:"application"})
-	},
+	},*/
 
 	deactivate:function() {
 		var controller = this.controllerFor('collections')
 		controller.set('content', null);
 	}
 
-    })
+})
diff --git a/Mongoman/app/assets/javascripts/routes/start_route.js b/Mongoman/app/assets/javascripts/routes/start_route.js
index def03e0..c037dec 100644
--- a/Mongoman/app/assets/javascripts/routes/start_route.js
+++ b/Mongoman/app/assets/javascripts/routes/start_route.js
@@ -1,22 +1,20 @@
 Mongoman.StartRoute = Ember.Route.extend({
-	init: function() {
-	    this._super();
-	    window.history.pushState("", "",'/#/');
-	},
+  init: function() {
+      this._super();
+      window.history.pushState("", "",'/#/');
+  },
 
-	model: function() {
-	  return Mongoman.Request.find("/databases?")
-	},
+  model: function() {
+    return Mongoman.Request.find("/databases?")
+  },
 
-	renderTemplate: function() {
-	    this.render('databases');
-	},
+  renderTemplate: function() {
+      this.render('databases');
+  },
 
-	setupController: function(controller,model) {
-	    controller.set('content', model.databases)
-	    controller.set('content.count', model.count)
-	    controller.set('content.isLoaded',false)
-	    controller.set('content.isLoaded',true)
-	}
+  setupController: function(controller,model) {
+     controller.set('content', model.databases)
+     controller.set('content.count', model.count)
+  }
 
 });
diff --git a/Mongoman/app/assets/javascripts/templates/collections.handlebars b/Mongoman/app/assets/javascripts/templates/collections.handlebars
index 726253d..40043d6 100644
--- a/Mongoman/app/assets/javascripts/templates/collections.handlebars
+++ b/Mongoman/app/assets/javascripts/templates/collections.handlebars
@@ -4,24 +4,27 @@
   	<a href="#/">Databases</a>
   	<button class="new-button" {{action 'addCollection'}}>+ New Collection</button>
   	<div class="arrow-right"></div>
-  	<a href="#/collections/{{unbound collection_name}}">{{database_name}}</a>
+  	{{#linkTo 'collections' database.name}}{{database_name}}{{/linkTo}}
 	</div>
 	<div style="display:none;" id="newcollection-create">Enter the Collection name:<br /><br />
   	{{input valueBinding="content.newCollection" size="30"}}</div>
-  {{#if content.isLoaded}}
+  {{#if isLoaded}}
 	<table class="mainpage-table">
-					<tr class="mainpage-table-row"><th>Collection Name</th>
+					<tr class="mainpage-table-row">
+              <th>Collection Name</th>
 							<th>Documents</th>
 							<th>Avg Document Size</th>
 							<th>Size</th>
 							<th>Indexes</th>
 					</tr>
 					{{#each stats}}
-					<tr class="mainpage-table-row"><td><a href="#/documents/{{unbound getdbName this.stats.ns}}/{{unbound sanitize undefined this.stats.ns}}" class="table-links">{{sanitize undefined this.stats.ns}}</a>
-							<td>{{this.stats.count}}</td>
-							<td>{{truncate this.stats.avgObjSize}}  bytes</td>
-							<td>{{this.stats.size}}</td>
-							<td>{{this.stats.nindexes}}</td>
+					<tr class="mainpage-table-row">
+            <td>
+              <a href="#/documents/{{unbound getdbName this.stats.ns}}/{{unbound sanitize undefined stats.ns}}" class="table-links">{{sanitize undefined this.stats.ns}}</a>
+							<td>{{stats.count}}</td>
+							<td>{{truncate stats.avgObjSize}}  bytes</td>
+							<td>{{stats.size}} bytes</td>
+							<td>{{stats.nindexes}}</td>
 					</tr>
 					{{/each}}
 	</table>
@@ -33,4 +36,4 @@
 <div id="placeholder-confirm-drop-db" style="display:none;"> Honestly ? </div>
 </div>
 <div class="footer">
-</div>
\ No newline at end of file
+</div>
diff --git a/Mongoman/app/assets/javascripts/templates/databases.handlebars b/Mongoman/app/assets/javascripts/templates/databases.handlebars
index 7066959..1fe07b2 100644
--- a/Mongoman/app/assets/javascripts/templates/databases.handlebars
+++ b/Mongoman/app/assets/javascripts/templates/databases.handlebars
@@ -5,7 +5,7 @@
   </div>
   <div style="display:none;" id="newdb-create">Enter the Database name:<br /><br />
   	{{input valueBinding="content.newDbName" size="30"}}</div>
-  {{#if content.isLoaded}}
+  {{#if isLoaded}}
 	<table class="mainpage-table">
 					<tr class="mainpage-table-row">
 							<th>Database Name</th>
@@ -14,10 +14,11 @@
 							<th>Indexes</th>
 					</tr>
 					{{#each content}}
-					<tr class="mainpage-table-row"><td><a href = '#/collections/{{unbound this.name}}' class="table-links">{{this.name}}</a>
-							<td>{{this.collection_count}}</td>
-							<td>{{this.size}}</td>
-							<td>{{this.indexes}}</td>
+					<tr class="mainpage-table-row">
+            <td>{{#linkTo 'collections' this.name class="table-links"}}{{this.name}}{{/linkTo}}</td>
+						<td>{{this.collection_count}}</td>
+						<td>{{this.size}}</td>
+						<td>{{this.indexes}}</td>
 					</tr>
 					{{/each}}
 	</table>
@@ -27,4 +28,4 @@
 {{/if}}
 </div>
 <div class="footer">
-</div>
\ No newline at end of file
+</div>
diff --git a/Mongoman/app/assets/javascripts/templates/documents.handlebars b/Mongoman/app/assets/javascripts/templates/documents.handlebars
index 3c69a6b..81f2390 100644
--- a/Mongoman/app/assets/javascripts/templates/documents.handlebars
+++ b/Mongoman/app/assets/javascripts/templates/documents.handlebars
@@ -4,7 +4,7 @@
   <button class="new-button" {{action 'addDocument'}}>+ New Document</button>
   <div class="arrow-right"></div>
   <a href="#/collections/{{unbound database_name}}">{{database_name}}</a><div class="arrow-right"></div>{{collection_name}}</div>
-  {{#if controller.isLoaded}}
+  {{#if isLoaded}}
     <ul>
       <li class="inline-search-box">
         <form {{action search on="submit"}} class="inline-form-search-box" title="syntax is: field:value, separate nested fields by a dot. For ObjectIds, just copy paste the id and hit return.">
diff --git a/Mongoman/app/assets/stylesheets/_pages/documents.css b/Mongoman/app/assets/stylesheets/_pages/documents.css
index 74f65ea..84263e5 100644
--- a/Mongoman/app/assets/stylesheets/_pages/documents.css
+++ b/Mongoman/app/assets/stylesheets/_pages/documents.css
@@ -121,6 +121,8 @@
   border-radius: 3px;
   border: 1px solid #ccc;
   box-shadow: 1px 1px 0 #fff;
+  font: 16px arial,sans-serif;
+  color: #222;
 }
 
 .documents-search-box:focus {
@@ -128,6 +130,8 @@
   z-index: 40;
   position: relative;
   min-width: 35%;
+  font: 16px arial,sans-serif;
+  color: #222;
 }
 
 /*Styles for pagination to display correctly*/
diff --git a/Mongoman/app/assets/stylesheets/_pages/home.css b/Mongoman/app/assets/stylesheets/_pages/home.css
index a1b22f5..14956e8 100644
--- a/Mongoman/app/assets/stylesheets/_pages/home.css
+++ b/Mongoman/app/assets/stylesheets/_pages/home.css
@@ -10,6 +10,7 @@
 .fluid-container{
 	min-width: 1000px;
 	width: 102%;
+  font-family: helvetica;
 	max-height: 50px;
 	height: 50px;
 	overflow: hidden;
@@ -55,8 +56,11 @@
 }
 
 .main-body{
-	margin-left: 60px;
-	margin-right: 70px;
-	margin-top: 80px;
+  width: 87%;
+  display: list-item;
+  list-style-type: none;
+  margin-left: 7.5%;
+  margin-top:  80px;
+  margin-top:  80px;
 }
 
diff --git a/Mongoman/app/assets/stylesheets/_pages/mainpage.css b/Mongoman/app/assets/stylesheets/_pages/mainpage.css
index 3bd3fd1..99036d8 100644
--- a/Mongoman/app/assets/stylesheets/_pages/mainpage.css
+++ b/Mongoman/app/assets/stylesheets/_pages/mainpage.css
@@ -3,6 +3,7 @@ display: block;
 font-family: helvetica, sans-serif;
 white-space: pre;
 margin: 1em 0px;
+font-family: helvetica;
 }
 
 .notice-div {
@@ -16,6 +17,7 @@ margin: 1em 0px;
 .mainpage-table {
 	width: 87%;
 	background-color: #fafafa;
+  border-collapse: collapse !important;
 	margin-top: 5px;
 	border-radius: 3px;
 	border-collapse:separate;
@@ -26,11 +28,16 @@ margin: 1em 0px;
 .mainpage-table-row {
 	text-align: justify;
   background-color: #fafafa;
-  border-bottom: 2px solid blue !important;
+  font-family: helvetica;
 }
 
 .table-links {
-	color: #0E7B9C !important;
+	color: #4183c4 !important;
+}
+
+td, th {
+  padding: 7px 3px;
+  border-top: 1px solid #eee;
 }
 
 .list-heading{
@@ -46,7 +53,7 @@ margin: 1em 0px;
   color: black;
   line-height: 1.375;
   text-decoration: none;
-  text-indent: 3px; 
+  text-indent: 3px;
   font-weight: 3em;
   margin-left: 38px;
   height: 30px;
@@ -61,7 +68,7 @@ margin: 1em 0px;
 
 }
 
-.arrow-right { 
+.arrow-right {
     border-color:  rgba(212,228,239,1) blue rgba(223, 235, 243, 1) gray;
     border-style: solid;
     border-width: 6px 0px 6px 6px;
@@ -86,7 +93,7 @@ margin: 1em 0px;
   line-height: 34px;
   max-width: 900px;
   font-family: helvetica;
-  text-align: justify;  
+  text-align: justify;
   color: #444;
 
-}
\ No newline at end of file
+}
diff --git a/Mongoman/vendor/assets/javascripts/jquery.flash.js b/Mongoman/vendor/assets/javascripts/jquery.flash.js
index fd43b77..ec0a319 100644
--- a/Mongoman/vendor/assets/javascripts/jquery.flash.js
+++ b/Mongoman/vendor/assets/javascripts/jquery.flash.js
@@ -1,38 +1,35 @@
-// 
+//
 // jQuery Flash plugin v1.0
-// 
+//
 //  - Created by Joel Moss at Codaset (joel@codaset.com)
 //  - http://codaset.com/codaset/jquery-flash
-// 
-// 
+//
+//
 // Simply call the following to show a flash message with the text "This is my message":
-// 
+//
 //    $.flash('This is my message');
-// 
+//
 // Or you can call it on an element, where the flash message will be populated from the
 // contents of the element:
-// 
+//
 //    $('#my-element').flash();
-// 
-// 
+//
+//
 // To install, just include this javascript file and the accompanying CSS file into your
 // HTML page. And that's it!
-// 
-// 
+//
+//
 // If you need help, found a bug, or would like to contribute, head on over to
 // http://codaset.com/codaset/jquery-flash
 // Heavily modifed by Hrish2006. Not reuable unless you are able to!
 
-(function($){ 
-  
+(function($){
+
   $(function() {
 
-    var flashDiv = '<div id="flash" style="display:none;position:absolute;top:70px;width:77%;margin-left: 100px;overflow:scroll;"> \
-                      <div class="flash_close"></div> \
-                      <div class="flash_inner"></div> \
-                    </div>';
+    var flashDiv = '<div id="flash" style="display:none;position:absolute;top:70px;width: 74.5%;margin-left: 10.5%;"><div class="flash_close"></div><div class="flash_inner"></div></div>';
     $(flashDiv).appendTo('body');
-  
+
     $.extend({
       flash: function(content, options) {
         var flash = $('#flash');
@@ -46,7 +43,7 @@
         });
       }
     });
-  
+
     $.fn.extend({
       bottom: function() {
         var offLeft = 107,
@@ -57,7 +54,7 @@
         });
         return this;
       },
-    
+
       flash: function(options) {
         $.flash(this.html(), options);
         return this;
@@ -65,5 +62,5 @@
     });
 
   });
-  
-})(jQuery); 
+
+})(jQuery);