diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
index 01d376c27..58cb6dd48 100644
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -115,8 +115,21 @@ span.section_row_buttons a {
     float: right;
 }
 
+#timebeforetooltip{
+    margin-top:-3px;
+    text-align:right;
+}
+
 #timebeforetooltip_span {
     float: right;
+    padding: 0px 5px;
+    font-size: 85%;
+}
+
+#timebeforetooltip_label {
+    float: right;
+    text-align:right;
+    font-size: 85%;
 }
 
 #tooltipontab_span {
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 0655e5b10..b46220f9e 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">
@@ -270,7 +270,8 @@
                 </div>
                 <div class="section_row">
                     <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>