diff --git a/IPython/html/static/tree/js/main.js b/IPython/html/static/tree/js/main.js
index cbf14d3c3..5f388618b 100644
--- a/IPython/html/static/tree/js/main.js
+++ b/IPython/html/static/tree/js/main.js
@@ -13,9 +13,17 @@
 $(document).ready(function () {
 
     IPython.page = new IPython.Page();
-    $('#new_notebook').click(function (e) {
-        window.open($('body').data('baseProjectUrl')+'new');
-    });
+    
+    if ($('body').data('notebookPath') == "") {
+        $('#new_notebook').button().click(function (e) {
+                window.open($('body').data('baseProjectUrl')+'notebooks/'+'new');
+        });
+    }
+    else {
+        $('#new_notebook').button().click(function (e) {
+                window.open($('body').data('baseProjectUrl')+'notebooks/'+$('body').data('notebookPath') + '/new');
+        });
+    }
     
     IPython.notebook_list = new IPython.NotebookList('#notebook_list');
     IPython.cluster_list = new IPython.ClusterList('#cluster_list');
@@ -30,14 +38,14 @@ $(document).ready(function () {
         //refresh immediately , then start interval
         if($('.upload_button').length == 0)
         {
-            IPython.notebook_list.load_list();
+            IPython.notebook_list.load_sessions();
             IPython.cluster_list.load_list();
         }
         if (!interval_id){
             interval_id = setInterval(function(){
                     if($('.upload_button').length == 0)
                     {
-                        IPython.notebook_list.load_list();
+                        IPython.notebook_list.load_sessions();
                         IPython.cluster_list.load_list();
                     }
                 }, time_refresh*1000);
diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index a0b88405b..b52a7fd1f 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -18,10 +18,28 @@ var IPython = (function (IPython) {
             this.style();
             this.bind_events();
         }
+        this.notebooks_list = new Array();
+        this.sessions = new Object();
     };
 
     NotebookList.prototype.baseProjectUrl = function () {
-        return $('body').data('baseProjectUrl')
+        return $('body').data('baseProjectUrl');
+    };
+    
+    NotebookList.prototype.notebookPath = function() {
+        var path = $('body').data('notebookPath');
+        if (path != "") {
+            if (path[path.length-1] != '/') {
+                path = path.substring(0,path.length);  
+            };            
+            return path;
+        } else {
+            return path;
+        };
+    };
+    
+    NotebookList.prototype.url_name = function(name){
+        return encodeURIComponent(name);
     };
 
     NotebookList.prototype.style = function () {
@@ -84,6 +102,35 @@ var IPython = (function (IPython) {
         this.element.children('.list_item').remove();
     };
 
+    NotebookList.prototype.load_sessions = function(){
+        var settings = {
+            processData : false,
+            cache : false,
+            type : "GET",
+            dataType : "json",
+            success : $.proxy(this.sessions_loaded, this)
+        };
+        var url = this.baseProjectUrl() + 'api/sessions';
+        $.ajax(url,settings);
+    };
+
+
+    NotebookList.prototype.sessions_loaded = function(data){
+        this.sessions=new Object();
+        var len = data.length;
+        if (len != 0) {
+            for (var i=0; i<len; i++) {
+                if (data[i]['notebook_path']==null) {
+                    nb_path = data[i]['notebook_name'];
+                }
+                else {
+                    nb_path = data[i]['notebook_path'] + data[i]['notebook_name'];
+                }
+                this.sessions[nb_path]= data[i]['session_id'];
+            }
+        };
+        this.load_list();
+    };
 
     NotebookList.prototype.load_list = function () {
         var that = this;
@@ -98,7 +145,7 @@ var IPython = (function (IPython) {
                              },this)
         };
 
-        var url = this.baseProjectUrl() + 'notebooks';
+        var url = this.baseProjectUrl() + 'api/notebooks/' + this.notebookPath();
         $.ajax(url, settings);
     };
 
@@ -110,7 +157,6 @@ var IPython = (function (IPython) {
         }
         var len = data.length;
         this.clear_list();
-
         if(len == 0)
         {
             $(this.new_notebook_item(0))
@@ -119,18 +165,17 @@ var IPython = (function (IPython) {
                     .text(message)
                     )
         }
-
         for (var i=0; i<len; i++) {
-            var notebook_id = data[i].notebook_id;
-            var nbname = data[i].name;
-            var kernel = data[i].kernel_id;
+            var name = data[i].notebook_name;
+            var path = this.notebookPath();
+            var nbname = name.split(".")[0];
             var item = this.new_notebook_item(i);
-            this.add_link(notebook_id, nbname, item);
-            // hide delete buttons when readonly
-            if(kernel == null){
+            this.add_link(path, nbname, item);
+            name = this.notebookPath() + name;
+            if(this.sessions[name] == undefined){
                 this.add_delete_button(item);
             } else {
-                this.add_shutdown_button(item,kernel);
+                this.add_shutdown_button(item,this.sessions[name]);
             }
         };
     };
@@ -157,12 +202,12 @@ var IPython = (function (IPython) {
     };
 
 
-    NotebookList.prototype.add_link = function (notebook_id, nbname, item) {
+    NotebookList.prototype.add_link = function (path, nbname, item) {
         item.data('nbname', nbname);
-        item.data('notebook_id', notebook_id);
+        item.data('path', path);
         item.find(".item_name").text(nbname);
         item.find("a.item_link")
-            .attr('href', this.baseProjectUrl()+notebook_id)
+            .attr('href', this.baseProjectUrl() + "notebooks/" + this.notebookPath() + nbname + ".ipynb")
             .attr('target','_blank');
     };
 
@@ -184,7 +229,7 @@ var IPython = (function (IPython) {
     };
 
 
-    NotebookList.prototype.add_shutdown_button = function (item, kernel) {
+    NotebookList.prototype.add_shutdown_button = function (item, session) {
         var that = this;
         var shutdown_button = $("<button/>").text("Shutdown").addClass("btn btn-mini").
             click(function (e) {
@@ -194,10 +239,10 @@ var IPython = (function (IPython) {
                     type : "DELETE",
                     dataType : "json",
                     success : function (data, status, xhr) {
-                        that.load_list();
+                        that.load_sessions();
                     }
                 };
-                var url = that.baseProjectUrl() + 'kernels/'+kernel;
+                var url = that.baseProjectUrl() + 'api/sessions/' + session;
                 $.ajax(url, settings);
                 return false;
             });
@@ -216,7 +261,6 @@ var IPython = (function (IPython) {
                 // data because the outer scopes values change as we iterate through the loop.
                 var parent_item = that.parents('div.list_item');
                 var nbname = parent_item.data('nbname');
-                var notebook_id = parent_item.data('notebook_id');
                 var message = 'Are you sure you want to permanently delete the notebook: ' + nbname + '?';
                 IPython.dialog.modal({
                     title : "Delete notebook",
@@ -234,7 +278,12 @@ var IPython = (function (IPython) {
                                         parent_item.remove();
                                     }
                                 };
-                                var url = notebooklist.baseProjectUrl() + 'notebooks/' + notebook_id;
+                                if (notebooklist.notebookPath() == "") {
+                                    var url = notebooklist.baseProjectUrl() + 'api/notebooks/' + nbname; 
+                                }
+                                else {
+                                    var url = notebooklist.baseProjectUrl() + 'api/notebooks/' + notebooklist.notebookPath() + nbname;
+                                }
                                 $.ajax(url, settings);
                             }
                         },