diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
index 01d376c..8f9bf66 100644
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -115,6 +115,11 @@ span.section_row_buttons a {
     float: right;
 }
 
+#timebeforetooltip{
+    margin-top:-3px;
+    text-align:right;
+}
+
 #timebeforetooltip_span {
     float: right;
 }
diff --git a/IPython/frontend/html/notebook/static/js/panelsection.js b/IPython/frontend/html/notebook/static/js/panelsection.js
index 191da5a..8e717c0 100644
--- a/IPython/frontend/html/notebook/static/js/panelsection.js
+++ b/IPython/frontend/html/notebook/static/js/panelsection.js
@@ -137,6 +137,7 @@ var IPython = (function (IPython) {
         this.content.find('#tooltipontab').attr('title', 'Show tooltip if you press <Tab> after "(" or a white space');
         this.content.find('#tooltipontab_label').attr('title', 'Show Tooltip when pressing Tab');
 
+        this.content.find('#timebeforetooltip').addClass("ui-widget ui-widget-content");
         this.content.find('#timebeforetooltip').attr('title', 'Time before a tooltip auto-appear when "(" is pressed (negative value supress tooltip)');
         this.content.find('#timebeforetooltip_label').attr('title', 'Time before a tooltip auto-appear when "(" is pressed (negative value supress tooltip)');
 
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 0655e5b..16d70af 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -253,7 +253,7 @@
 
         <div id="config_section">
             <div class="section_header">
-                <h3>Config</h3>
+                <h3>Configuration</h3>
             </div>
             <div class="section_content">
                 <div class="section_row">
@@ -269,10 +269,11 @@
                     <span class="checkbox_label" id="smartcompleter_label">Smart completer:</span>
                 </div>
                 <div class="section_row">
+                    <span class="numeric_input_label" id="timebeforetooltip_label">Time before tooltip : </span>
                     <span id="timebeforetooltip_span">
-                        <input type="text" id="timebeforetooltip" value="1200"></input>
+                        <input type="text" id="timebeforetooltip" value="1200" size='6'></input>
+                        <span class="numeric_input_label" id="timebeforetooltip_unit">milliseconds</span>
                     </span>
-                    <span class="numeric_input_label" id="timebeforetooltip_label">Time before tooltip : </span>
                 </div>
             </div>
         </div>