diff --git a/.gitignore b/.gitignore
index a8862c19c3..591c2afc61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ __pycache__
 .coverage
 .pytest_cache
 src
-
+*.iml
 *.swp
 *.map
 .idea/
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index 73ea7de3fb..61bcc216bc 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -54,6 +54,7 @@
 
 {% endblock headercontainer %}
 
+<div role="navigation">
 {% block header %}
 <div id="menubar-container" class="container">
 <div id="menubar">
@@ -330,6 +331,7 @@
         </div>
     </div>
 </div>
+</div>
 
 <div id="maintoolbar" class="navbar">
   <div class="toolbar-inner navbar-inner navbar-nobg">
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 9e68da1b2c..54f9324d87 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -122,7 +122,7 @@
   </div>
 </noscript>
 
-<div id="header">
+<div id="header" role="navigation" aria-label="Top Menu">
   <div id="header-container" class="container">
   <div id="ipython_notebook" class="nav navbar-brand"><a href="{{default_url}}
     {%- if logged_in and token -%}?token={{token}}{%- endif -%}" title='{% trans %}dashboard{% endtrans %}'>
@@ -147,17 +147,17 @@
   {% endblock %}
 
   {% endblock header_buttons %}
-  
+
   </div>
   <div class="header-bar"></div>
 
   {% block header %}
   {% endblock %}
-</div>
+    </div>
 
 <div id="site">
-{% block site %}
-{% endblock %}
+    {% block site %}
+    {% endblock %}
 </div>
 
 {% block after_site %}
diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index 29343c11d5..a482f828f9 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -1,5 +1,4 @@
 {% extends "page.html" %}
-
 {% block title %}{{page_title}}{% endblock %}
 
 
@@ -27,7 +26,8 @@
 {% block site %}
 
   <div id="ipython-main-app" class="container">
-    <div id="tab_content" class="tabbable">
+
+    <div id="tab_content" class="tabbable" role="main">
       <ul id="tabs" class="nav nav-tabs">
         <li class="active"><a href="#notebooks" data-toggle="tab" role="tab">{% trans %}Files{% endtrans %}</a></li>
         <li><a href="#running" data-toggle="tab" role="tab">{% trans %}Running{% endtrans %}</a></li>
@@ -224,3 +224,4 @@
 <script src="{{ static_url("tree/js/main.min.js") }}" type="text/javascript" charset="utf-8"></script>
 
 {% endblock %}
+