diff --git a/IPython/frontend/html/notebook/static/codemirror2/lib/codemirror.css b/IPython/frontend/html/notebook/static/codemirror2/lib/codemirror.css
index e7884ff..cb06a4e 100644
--- a/IPython/frontend/html/notebook/static/codemirror2/lib/codemirror.css
+++ b/IPython/frontend/html/notebook/static/codemirror2/lib/codemirror.css
@@ -1,7 +1,7 @@
 .CodeMirror {
   overflow: hidden; /* Changed from auto to remove scrollbar */
   height: auto; /* Changed to auto to autogrow */
-/*  line-height: 1em;*/
+  line-height: 1em;
   font-family: monospace;
 }
 
@@ -19,8 +19,10 @@
 }
 .CodeMirror-lines {
   /* Changed from 0.4em, but this gives us jitters upon typing, but I found
-     that removing .CodeMirror line-height: 1em above, it goes away. */
-  padding: 0em;
+     that removing .CodeMirror line-height: 1em above, it goes away. 
+     For now I am using the default of 0.4em, but I have added a 0.4em
+     padding to prompts to match this.*/
+  padding: 0.4em;
 }
 
 .CodeMirror pre {
diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
index 983b714..fed7832 100644
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -61,7 +61,7 @@ input, select { vertical-align: middle; }
 body {
     background-color: white;
     /* This won't propagate to all children so we also set it below */
-    font-size: 10pt;
+    font-size: 11pt;
     /* This makes sure that the body covers the entire window and needs to
        be in a different element than the display: box in wrapper below */
     position: absolute;
@@ -156,7 +156,7 @@ div#notebook {
     padding: 0px 15px 0px 15px;
     margin: 0px
     background-color: white;
-    font-size: 10pt;
+    font-size: 11pt;
 }
 
 div#pager_splitter {
@@ -170,7 +170,7 @@ div#pager {
 
 .monospace-font {
     font-family: monospace;
-    font-size: 10pt;
+    font-size: 11pt;
 }
 
 div.cell {
@@ -186,8 +186,9 @@ div.code_cell {
 
 div.prompt {
     width: 90px;
-    padding: 0px;
+    padding: 0.4em;
     margin: 0px;
+    line-height: 1em;
 }
 
 div.input_prompt {
@@ -210,7 +211,7 @@ div.output_area {
 
 div.output_latex {
     /* Slightly bigger than the rest of the notebook */
-    font-size: 11pt;
+    font-size: 12pt;
 }
 
 div.output_png {
@@ -222,7 +223,7 @@ div.text_cell {
 
 textarea.text_cell_input {
     /* Slightly bigger than the rest of the notebook */
-    font-size: 11pt;
+    font-size: 12pt;
     outline: none;
     resize: none;
     width:  inherit;
@@ -235,7 +236,7 @@ textarea.text_cell_input {
 div.text_cell_render {
     font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
     /* Slightly bigger than the rest of the notebook */
-    font-size: 11pt;
+    font-size: 12pt;
     outline: none;
     resize: none;
     width:  inherit;
diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index ff624f8..9b8379f 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -127,7 +127,7 @@ var IPython = (function (IPython) {
 
 
     Notebook.prototype.scroll_to_bottom = function () {
-        this.element.animate({scrollTop:this.element.get(0).scrollHeight}, 'slow');
+        this.element.animate({scrollTop:this.element.get(0).scrollHeight}, 0);
     };
 
     // Cell indexing, retrieval, etc.