diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css
index ce99477..ca28ede 100644
--- a/IPython/frontend/html/notebook/static/style/style.min.css
+++ b/IPython/frontend/html/notebook/static/style/style.min.css
@@ -1226,7 +1226,6 @@ ul.icons-ul{list-style-type:none;text-indent:-0.7142857142857143em;margin-left:2
 .alternate_upload.form{padding:0;margin:0;}
 .alternate_upload input.fileinput{background-color:red;position:relative;opacity:0;z-index:2;width:295px;margin-left:163px;cursor:pointer;}
 #tabs{border-style:none;}
-#tab1,#tab2{padding:1em 0em;}
 .list_toolbar{padding:5px;height:25px;line-height:25px;}
 .toolbar_info{float:left;}
 .toolbar_buttons{float:right;}
@@ -1235,9 +1234,9 @@ ul.icons-ul{list-style-type:none;text-indent:-0.7142857142857143em;margin-left:2
 .notebook_item a{text-decoration:none;}
 .status_col{float:right;width:325px;}
 .engines_col{float:right;width:325px;}
-.action_col{float:right;}
-.item_buttons{float:right;}
-.item_buttons .upload_button{color:darkred;}
+.action_col{float:right;width:64px;text-align:right;}
+.item_buttons{float:right;margin-top:1px;}
+input.nbname_input{height:15px;}
 .highlight_text{color:blue;}
 #project_name>.breadcrumb{padding:0;background-color:transparent;}
 input.engine_num_input{height:20px;margin-bottom:2px;padding-top:0;padding-bottom:0;width:90px;}
diff --git a/IPython/frontend/html/notebook/static/tree/js/clusterlist.js b/IPython/frontend/html/notebook/static/tree/js/clusterlist.js
index aef73cf..3f0ec77 100644
--- a/IPython/frontend/html/notebook/static/tree/js/clusterlist.js
+++ b/IPython/frontend/html/notebook/static/tree/js/clusterlist.js
@@ -120,7 +120,7 @@ var IPython = (function (IPython) {
         engines_col.append(input);
         var start_button = $('<button/>').addClass("btn btn-mini").text("Start");
         var action_col = $('<span/>').addClass('action_col').append(
-            $("<span/>").addClass("btn-group pull-right").append(
+            $("<span/>").addClass("item_buttons btn-group pull-right").append(
                 start_button
             )
         );
@@ -161,7 +161,7 @@ var IPython = (function (IPython) {
         var engines_col = $('<span/>').addClass('engines_col').html(this.data.n);
         var stop_button = $('<button/>').addClass("btn btn-mini").text("Stop");
         var action_col = $('<span/>').addClass('action_col').append(
-            $("<span/>").addClass("btn-group pull-right").append(
+            $("<span/>").addClass("item_buttons btn-group pull-right").append(
                 stop_button
             )
         );
diff --git a/IPython/frontend/html/notebook/static/tree/js/main.js b/IPython/frontend/html/notebook/static/tree/js/main.js
index 7e1897d..0a1edcc 100644
--- a/IPython/frontend/html/notebook/static/tree/js/main.js
+++ b/IPython/frontend/html/notebook/static/tree/js/main.js
@@ -13,9 +13,7 @@
 $(document).ready(function () {
 
     IPython.page = new IPython.Page();
-    // $('#ipython-main-app').addClass('border-box-sizing ui-widget');
-    // $('div#notebooks_toolbar').addClass('ui-widget ui-helper-clearfix');    
-    $('#new_notebook').button().click(function (e) {
+    $('#new_notebook').click(function (e) {
         window.open($('body').data('baseProjectUrl')+'new');
     });
 
diff --git a/IPython/frontend/html/notebook/static/tree/js/notebooklist.js b/IPython/frontend/html/notebook/static/tree/js/notebooklist.js
index e05199a..4f2a4dd 100644
--- a/IPython/frontend/html/notebook/static/tree/js/notebooklist.js
+++ b/IPython/frontend/html/notebook/static/tree/js/notebooklist.js
@@ -162,7 +162,6 @@ var IPython = (function (IPython) {
 
 
     NotebookList.prototype.add_link = function (notebook_id, nbname, item) {
-        console.log(item);
         item.data('nbname', nbname);
         item.data('notebook_id', notebook_id);
         item.find("a.item_row")
@@ -176,10 +175,11 @@ var IPython = (function (IPython) {
         item.data('nbname', nbname);
         var new_item_name = $('<span/>').addClass('item_name');
         new_item_name.append(
-            $('<input/>').addClass('ui-widget ui-widget-content').
-            attr('value', nbname).
-            attr('size', '30').
-            attr('type', 'text')
+            $('<input/>')
+            .addClass("nbname_input")
+            .attr('value', nbname)
+            .attr('size', '30')
+            .attr('type', 'text')
         );
         var e = item.find('.item_name');
         if (e.length === 0) {
@@ -263,10 +263,9 @@ var IPython = (function (IPython) {
 
     NotebookList.prototype.add_upload_button = function (item) {
         var that = this;
-        var new_buttons = $('<span/>').addClass('item_buttons');
-        var upload_button = $('<button>Upload</button>').button().
-            addClass('upload-button').
-            click(function (e) {
+        var upload_button = $('<button/>').text("Upload")
+            .addClass('btn btn-primary btn-mini upload_button')
+            .click(function (e) {
                 var nbname = item.find('.item_name > input').attr('value');
                 var nbformat = item.data('nbformat');
                 var nbdata = item.data('nbdata');
@@ -294,13 +293,14 @@ var IPython = (function (IPython) {
                 $.ajax(url, settings);
                 return false;
             });
-        var cancel_button = $('<button>Cancel</button>').button().
-            click(function (e) {
+        var cancel_button = $('<button/>').text("Cancel")
+            .addClass("btn btn-mini")
+            .click(function (e) {
+                console.log('cancel click');
                 item.remove();
                 return false;
             });
-        upload_button.addClass('upload_button');
-        item.find(".item_buttons").html("")
+        item.find(".item_buttons").empty()
             .append(upload_button)
             .append(cancel_button);
     };
diff --git a/IPython/frontend/html/notebook/static/tree/less/tree.less b/IPython/frontend/html/notebook/static/tree/less/tree.less
index 592d461..c0986b9 100644
--- a/IPython/frontend/html/notebook/static/tree/less/tree.less
+++ b/IPython/frontend/html/notebook/static/tree/less/tree.less
@@ -10,7 +10,6 @@
 }
 
 #tab1, #tab2 {
-    padding: 1em 0em;
 }
 
 .list_toolbar {
@@ -64,14 +63,17 @@
 
 .action_col {
     float: right;
+    width: 64px;
+    text-align: right;
 }
 
 .item_buttons {
     float: right;
+    margin-top: 1px;
 }
 
-.item_buttons .upload_button {
-    color: darkred;
+input.nbname_input {
+    height: 15px;
 }
 
 .highlight_text {