diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py
index 1a2a509..bca7648 100644
--- a/IPython/frontend/html/notebook/handlers.py
+++ b/IPython/frontend/html/notebook/handlers.py
@@ -225,6 +225,7 @@ class ProjectDashboardHandler(AuthenticatedHandler):
             base_kernel_url=self.application.ipython_app.base_kernel_url,
             read_only=self.read_only,
             logged_in=self.logged_in,
+            use_less=self.use_less,
             login_available=self.login_available))
 
 
@@ -295,7 +296,8 @@ class NamedNotebookHandler(AuthenticatedHandler):
         if not nbm.notebook_exists(notebook_id):
             raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)       
         template = self.application.jinja2_env.get_template('notebook.html')
-        self.write( template.render(project=project,
+        self.write( template.render(
+            project=project,
             notebook_id=notebook_id,
             base_project_url=self.application.ipython_app.base_project_url,
             base_kernel_url=self.application.ipython_app.base_kernel_url,
@@ -304,7 +306,8 @@ class NamedNotebookHandler(AuthenticatedHandler):
             logged_in=self.logged_in,
             login_available=self.login_available,
             mathjax_url=self.application.ipython_app.mathjax_url,
-            use_less=self.use_less,)
+            use_less=self.use_less
+            )
         )
 
 
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 6f54b58..c01cebe 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -18,12 +18,6 @@ window.mathjax_url = "{{mathjax_url}}";
 
 <link rel="stylesheet" href="{{ static_url("css/celltoolbar.css") }}" type="text/css" />
 
-{% if use_less %}
-    <link rel="stylesheet/less" href="{{ static_url("less/style.less") }}" type="text/css" />
-{% else %}
-    <link rel="stylesheet" href="{{ static_url("css/style.min.css") }}" type="text/css"/>
-{% endif %}
-
 {% endblock %}
 
 {% block params %}
@@ -185,9 +179,7 @@ class="notebook_app"
 
 {% block script %}
 
-{% if use_less %}
-<script src="{{ static_url("components/less.js/dist/less-1.3.3.min.js") }}" charset="utf-8"></script>
-{% endif %}
+{{super()}}
 
 <script src="{{ static_url("codemirror/lib/codemirror.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("codemirror/lib/util/loadmode.js") }}" charset="utf-8"></script>
diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html
index d978b96..6a7648d 100644
--- a/IPython/frontend/html/notebook/templates/page.html
+++ b/IPython/frontend/html/notebook/templates/page.html
@@ -16,6 +16,13 @@
     <link rel="stylesheet" href="{{static_url("css/page.css") }}" type="text/css"/>
     {% block stylesheet %}
     {% endblock %}
+    {% block lesscss %}
+        {% if use_less %}
+            <link rel="stylesheet/less" href="{{ static_url("less/style.less") }}" type="text/css" />
+        {% else %}
+            <link rel="stylesheet" href="{{ static_url("css/style.min.css") }}" type="text/css"/>
+        {% endif %}
+    {% endblock lesscss%}
     <link rel="stylesheet" href="{{ static_url("css/custom.css") }}" type="text/css" />
 
 
@@ -57,6 +64,9 @@
 <script src="{{static_url("js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
 
 {% block script %}
+    {% if use_less %}
+        <script src="{{ static_url("components/less.js/dist/less-1.3.3.min.js") }}" charset="utf-8"></script>
+    {% endif %}
 {% endblock %}
 
 <script src="{{static_url("js/custom.js") }}" type="text/javascript" charset="utf-8"></script>
diff --git a/IPython/frontend/html/notebook/templates/projectdashboard.html b/IPython/frontend/html/notebook/templates/projectdashboard.html
index eafb598..923a17b 100644
--- a/IPython/frontend/html/notebook/templates/projectdashboard.html
+++ b/IPython/frontend/html/notebook/templates/projectdashboard.html
@@ -82,6 +82,7 @@ data-read-only={{read_only}}
 {% endblock %}
 
 {% block script %}
+    {{super()}}
     <script src="{{static_url("js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>