diff --git a/notebook/static/tree/js/newnotebook.js b/notebook/static/tree/js/newnotebook.js
index d0ea5d5c2..cdca12e14 100644
--- a/notebook/static/tree/js/newnotebook.js
+++ b/notebook/static/tree/js/newnotebook.js
@@ -63,6 +63,7 @@ define([
                 .attr("id", "kernel-" +ks.name)
                 .data('kernelspec', ks).append(
                     $('<a>')
+                        .attr("aria-label","list item 1,"+ks.name)
                         .attr('href', '#')
                         .click($.proxy(this.new_notebook, this, ks.name))
                         .text(ks.spec.display_name)
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index 579cc45c5..e4c3b912a 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -80,25 +80,25 @@ data-notebook-path="{{notebook_path | urlencode}}"
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans %}File{% endtrans %}</a>
                     <ul id="file_menu" class="dropdown-menu">
                         <li id="new_notebook" class="dropdown-submenu">
-                            <a href="#">{% trans %}New Notebook{% endtrans %}</a>
+                            <a aria-label="list item 1, new notebook" href="#">{% trans %}New Notebook{% endtrans %}</a>
                             <ul class="dropdown-menu" id="menu-new-notebook-submenu"></ul>
                         </li>
                         <li id="open_notebook"
                             title="{% trans %}Opens a new window with the Dashboard view{% endtrans %}">
-                            <a href="#">{% trans %}Open...{% endtrans %}</a></li>
+                            <a aria-label="list item 2, open" href="#">{% trans %}Open...{% endtrans %}</a></li>
                         <!-- <hr/> -->
                         <li class="divider"></li>
                         <li id="copy_notebook"
                             title="{% trans %}Open a copy of this notebook's contents and start a new kernel{% endtrans %}">
-                            <a href="#">{% trans %}Make a Copy...{% endtrans %}</a></li>
+                            <a aria-label="list item 3, make a copy" href="#">{% trans %}Make a Copy...{% endtrans %}</a></li>
                         <li id="save_notebook_as"
                             title="{% trans %}Save a copy of the notebook's contents and start a new kernel{% endtrans %}">
-                            <a href="#">{% trans %}Save as...{% endtrans %}</a></li>
-                        <li id="rename_notebook"><a href="#">{% trans %}Rename...{% endtrans %}</a></li>
-                        <li id="save_checkpoint"><a href="#">{% trans %}Save and Checkpoint{% endtrans %}</a></li>
+                            <a aria-label="list item 4, save as " href="#">{% trans %}Save as...{% endtrans %}</a></li>
+                        <li id="rename_notebook"><a aria-label="list item 5, rename" href="#">{% trans %}Rename...{% endtrans %}</a></li>
+                        <li id="save_checkpoint"><a aria-label="list item 6, save and checkpoint" href="#">{% trans %}Save and Checkpoint{% endtrans %}</a></li>
                         <!-- <hr/> -->
                         <li class="divider"></li>
-                        <li id="restore_checkpoint" class="dropdown-submenu"><a href="#">{% trans %}Revert to Checkpoint{% endtrans %}</a>
+                        <li id="restore_checkpoint" class="dropdown-submenu"><a aria-label="list item 7, revert to checkpoint" href="#">{% trans %}Revert to Checkpoint{% endtrans %}</a>
                           <ul class="dropdown-menu">
                             <li><a href="#"></a></li>
                             <li><a href="#"></a></li>
@@ -108,12 +108,12 @@ data-notebook-path="{{notebook_path | urlencode}}"
                           </ul>
                         </li>
                         <li class="divider"></li>
-                        <li id="print_preview"><a href="#">{% trans %}Print Preview{% endtrans %}</a></li>
-                        <li class="dropdown-submenu"><a href="#">{% trans %}Download as{% endtrans %}</a>
+                        <li id="print_preview"><a aria-label="list item 8, print Preview" href="#">{% trans %}Print Preview{% endtrans %}</a></li>
+                        <li class="dropdown-submenu"><a aria-label="list item 9, download as" href="#">{% trans %}Download as{% endtrans %}</a>
                             <ul id="download_menu" class="dropdown-menu">
                                 {% for exporter in get_frontend_exporters() %}
                                 <li id="download_{{ exporter.name }}">
-                                    <a href="#">{{ exporter.display }}</a>
+                                    <a  href="#">{{ exporter.display }}</a>
                                 </li>
                                 {% endfor %}
                             </ul>
@@ -124,57 +124,57 @@ data-notebook-path="{{notebook_path | urlencode}}"
                         <li class="divider"></li>
                         <li id="trust_notebook"
                             title="{% trans %}Trust the output of this notebook{% endtrans %}">
-                            <a href="#" >{% trans %}Trust Notebook{% endtrans %}</a></li>
+                            <a aria-label="list item 10, trust notebook" href="#" >{% trans %}Trust Notebook{% endtrans %}</a></li>
                         <li class="divider"></li>
                         <li id="close_and_halt"
                             title="{% trans %}Shutdown this notebook's kernel, and close this window{% endtrans %}">
-                            <a href="#" >{% trans %}Close and Halt{% endtrans %}</a></li>
+                            <a aria-label="list item 11, cloase and Halt" href="#" >{% trans %}Close and Halt{% endtrans %}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans %}Edit{% endtrans %}</a>
                     <ul id="edit_menu" class="dropdown-menu">
-                        <li id="cut_cell"><a href="#">{% trans %}Cut Cells{% endtrans %}</a></li>
-                        <li id="copy_cell"><a href="#">{% trans %}Copy Cells{% endtrans %}</a></li>
-                        <li id="paste_cell_above" class="disabled"><a href="#">{% trans %}Paste Cells Above{% endtrans %}</a></li>
-                        <li id="paste_cell_below" class="disabled"><a href="#">{% trans %}Paste Cells Below{% endtrans %}</a></li>
-                        <li id="paste_cell_replace" class="disabled"><a href="#">{% trans %}Paste Cells &amp; Replace{% endtrans %}</a></li>
-                        <li id="delete_cell"><a href="#">{% trans %}Delete Cells{% endtrans %}</a></li>
-                        <li id="undelete_cell" class="disabled"><a href="#">{% trans %}Undo Delete Cells{% endtrans %}</a></li>
+                        <li id="cut_cell"><a aria-label="list item 1, cut cells" href="#">{% trans %}Cut Cells{% endtrans %}</a></li>
+                        <li id="copy_cell"><a aria-label="list item 2,copy cells" href="#">{% trans %}Copy Cells{% endtrans %}</a></li>
+                        <li id="paste_cell_above" class="disabled"><a aria-label="list item 3, paste cells above" href="#">{% trans %}Paste Cells Above{% endtrans %}</a></li>
+                        <li id="paste_cell_below" class="disabled"><a aria-label="list item 4, paste cells below" href="#">{% trans %}Paste Cells Below{% endtrans %}</a></li>
+                        <li id="paste_cell_replace" class="disabled"><a aria-label="list item 5, paste cells and replace" href="#">{% trans %}Paste Cells &amp; Replace{% endtrans %}</a></li>
+                        <li id="delete_cell"><a aria-label="list item 6, delete cells" href="#">{% trans %}Delete Cells{% endtrans %}</a></li>
+                        <li id="undelete_cell" class="disabled"><a aria-label="list item 7, undo delete cells" href="#">{% trans %}Undo Delete Cells{% endtrans %}</a></li>
                         <li class="divider"></li>
-                        <li id="split_cell"><a href="#">{% trans %}Split Cell{% endtrans %}</a></li>
-                        <li id="merge_cell_above"><a href="#">{% trans %}Merge Cell Above{% endtrans %}</a></li>
-                        <li id="merge_cell_below"><a href="#">{% trans %}Merge Cell Below{% endtrans %}</a></li>
+                        <li id="split_cell"><a aria-label="list item 8, split cell" href="#">{% trans %}Split Cell{% endtrans %}</a></li>
+                        <li id="merge_cell_above"><a aria-label="list item 9, merge cell above" href="#">{% trans %}Merge Cell Above{% endtrans %}</a></li>
+                        <li id="merge_cell_below"><a aria-label="list item 10, merge cell below" href="#">{% trans %}Merge Cell Below{% endtrans %}</a></li>
                         <li class="divider"></li>
-                        <li id="move_cell_up"><a href="#">{% trans %}Move Cell Up{% endtrans %}</a></li>
-                        <li id="move_cell_down"><a href="#">{% trans %}Move Cell Down{% endtrans %}</a></li>
+                        <li id="move_cell_up"><a aria-label="list item 11, move cell up" href="#">{% trans %}Move Cell Up{% endtrans %}</a></li>
+                        <li id="move_cell_down"><a aria-label="list item 12, move cell down" href="#">{% trans %}Move Cell Down{% endtrans %}</a></li>
                         <li class="divider"></li>
-                        <li id="edit_nb_metadata"><a href="#">{% trans %}Edit Notebook Metadata{% endtrans %}</a></li>
+                        <li id="edit_nb_metadata"><a aria-label="list item 13, edit notebook metadata" href="#">{% trans %}Edit Notebook Metadata{% endtrans %}</a></li>
                         <li class="divider"></li>
-                        <li id="find_and_replace"><a href="#"> {% trans %}Find and Replace{% endtrans %} </a></li>
+                        <li id="find_and_replace"><a aria-label="list item 14, find and replace" href="#"> {% trans %}Find and Replace{% endtrans %} </a></li>
                         <li class="divider"></li>
-                        <li id="cut_cell_attachments"><a href="#">{% trans %}Cut Cell Attachments{% endtrans %}</a></li>
-                        <li id="copy_cell_attachments"><a href="#">{% trans %}Copy Cell Attachments{% endtrans %}</a></li>
-                        <li id="paste_cell_attachments" class="disabled"><a href="#">{% trans %}Paste Cell Attachments{% endtrans %}</a></li>
+                        <li id="cut_cell_attachments"><a aria-label="list item 15, cut cell attachments" href="#">{% trans %}Cut Cell Attachments{% endtrans %}</a></li>
+                        <li id="copy_cell_attachments"><a aria-label="list item 16, copy cell attachments" href="#">{% trans %}Copy Cell Attachments{% endtrans %}</a></li>
+                        <li id="paste_cell_attachments" class="disabled"><a aria-label="list item 17, paste cell attachments" href="#">{% trans %}Paste Cell Attachments{% endtrans %}</a></li>
                         <li class="divider"></li>
-                        <li id="insert_image" class="disabled"><a href="#"> {% trans %}Insert Image{% endtrans %} </a></li>
+                        <li id="insert_image" class="disabled"><a aria-label="list item 18, insert image" href="#"> {% trans %}Insert Image{% endtrans %} </a></li>
                     </ul>
                 </li>
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans %}View{% endtrans %}</a>
                     <ul id="view_menu" class="dropdown-menu">
                         <li id="toggle_header"
                             title="{% trans %}Show/Hide the logo and notebook title (above menu bar){% endtrans %}">
-                            <a href="#">{% trans %}Toggle Header{% endtrans %}</a>
+                            <a aria-label="list item 1, toggle header" href="#">{% trans %}Toggle Header{% endtrans %}</a>
                         </li>
                         <li id="toggle_toolbar"
                             title="{% trans %}Show/Hide the action icons (below menu bar){% endtrans %}">
-                            <a href="#">{% trans %}Toggle Toolbar{% endtrans %}</a>
+                            <a aria-label="list item 2, toggle toolbar" href="#">{% trans %}Toggle Toolbar{% endtrans %}</a>
                         </li>
                         <li id="toggle_line_numbers"
                             title="{% trans %}Show/Hide line numbers in cells{% endtrans %}">
-                            <a href="#">{% trans %}Toggle Line Numbers{% endtrans %}</a>
+                            <a aria-label="list item 3, toggle line numbers" href="#">{% trans %}Toggle Line Numbers{% endtrans %}</a>
                         </li>
                         <li id="menu-cell-toolbar" class="dropdown-submenu">
-                            <a href="#">{% trans %}Cell Toolbar{% endtrans %}</a>
+                            <a aria-label="list item 4, cell toolbar" href="#">{% trans %}Cell Toolbar{% endtrans %}</a>
                             <ul class="dropdown-menu" id="menu-cell-toolbar-submenu"></ul>
                         </li>
                     </ul>
@@ -183,72 +183,72 @@ data-notebook-path="{{notebook_path | urlencode}}"
                     <ul id="insert_menu" class="dropdown-menu">
                         <li id="insert_cell_above"
                             title="{% trans %}Insert an empty Code cell above the currently active cell{% endtrans %}">
-                            <a href="#">{% trans %}Insert Cell Above{% endtrans %}</a></li>
+                            <a aria-label="list item 1, insert cell above" href="#">{% trans %}Insert Cell Above{% endtrans %}</a></li>
                         <li id="insert_cell_below"
                             title="{% trans %}Insert an empty Code cell below the currently active cell{% endtrans %}">
-                            <a href="#">{% trans %}Insert Cell Below{% endtrans %}</a></li>
+                            <a aria-label="list item 2, insert cell below" href="#">{% trans %}Insert Cell Below{% endtrans %}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans %}Cell{% endtrans %}</a>
                     <ul id="cell_menu" class="dropdown-menu">
                         <li id="run_cell" title="{% trans %}Run this cell, and move cursor to the next one{% endtrans %}">
-                            <a href="#">{% trans %}Run Cells{% endtrans %}</a></li>
+                            <a aria-label="list item 1, run cells" href="#">{% trans %}Run Cells{% endtrans %}</a></li>
                         <li id="run_cell_select_below" title="{% trans %}Run this cell, select below{% endtrans %}">
-                            <a href="#">{% trans %}Run Cells and Select Below{% endtrans %}</a></li>
+                            <a aria-label="list item 2, run cells and select below" href="#">{% trans %}Run Cells and Select Below{% endtrans %}</a></li>
                         <li id="run_cell_insert_below" title="{% trans %}Run this cell, insert below{% endtrans %}">
-                            <a href="#">{% trans %}Run Cells and Insert Below{% endtrans %}</a></li>
+                            <a aria-label="list item 3, run cells and insert below" href="#">{% trans %}Run Cells and Insert Below{% endtrans %}</a></li>
                         <li id="run_all_cells" title="{% trans %}Run all cells in the notebook{% endtrans %}">
-                            <a href="#">{% trans %}Run All{% endtrans %}</a></li>
+                            <a aria-label="list item 4, run all" href="#">{% trans %}Run All{% endtrans %}</a></li>
                         <li id="run_all_cells_above" title="{% trans %}Run all cells above (but not including) this cell{% endtrans %}">
-                            <a href="#">{% trans %}Run All Above{% endtrans %}</a></li>
+                            <a aria-label="list item 5, run all above" href="#">{% trans %}Run All Above{% endtrans %}</a></li>
                         <li id="run_all_cells_below" title="{% trans %}Run this cell and all cells below it{% endtrans %}">
-                            <a href="#">{% trans %}Run All Below{% endtrans %}</a></li>
+                            <a aria-label="list item 6, run all below" href="#">{% trans %}Run All Below{% endtrans %}</a></li>
                         <li class="divider"></li>
                         <li id="change_cell_type" class="dropdown-submenu"
                             title="{% trans %}All cells in the notebook have a cell type. By default, new cells are created as 'Code' cells{% endtrans %}">
-                            <a href="#">{% trans %}Cell Type{% endtrans %}</a>
+                            <a aria-label="list item 7, cell type" href="#">{% trans %}Cell Type{% endtrans %}</a>
                             <ul class="dropdown-menu">
                               <li id="to_code"
                                   title="{% trans %}Contents will be sent to the kernel for execution, and output will display in the footer of cell{% endtrans %}">
-                                  <a href="#">Code</a></li>
+                                  <a aria-label="list item 1, code" href="#">Code</a></li>
                               <li id="to_markdown"
                                   title="{% trans %}Contents will be rendered as HTML and serve as explanatory text{% endtrans %}">
-                                  <a href="#">{% trans %}Markdown{% endtrans %}</a></li>
+                                  <a aria-label="list item 2, markdown" href="#">{% trans %}Markdown{% endtrans %}</a></li>
                               <li id="to_raw"
                                   title="{% trans %}Contents will pass through nbconvert unmodified{% endtrans %}">
-                                  <a href="#">{% trans %}Raw NBConvert{% endtrans %}</a></li>
+                                  <a aria-label="list item 3, raw NBConvert" href="#">{% trans %}Raw NBConvert{% endtrans %}</a></li>
                             </ul>
                         </li>
                         <li class="divider"></li>
-                        <li id="current_outputs" class="dropdown-submenu"><a href="#">{% trans %}Current Outputs{% endtrans %}</a>
+                        <li id="current_outputs" class="dropdown-submenu"><a aria-label="list item 8, current output" href="#">{% trans %}Current Outputs{% endtrans %}</a>
                             <ul class="dropdown-menu">
                                 <li id="toggle_current_output"
                                     title="{% trans %}Hide/Show the output of the current cell{% endtrans %}">
-                                    <a href="#">{% trans %}Toggle{% endtrans %}</a>
+                                    <a aria-label="list item 1,toggle" href="#">{% trans %}Toggle{% endtrans %}</a>
                                 </li>
                                 <li id="toggle_current_output_scroll"
                                     title="{% trans %}Scroll the output of the current cell{% endtrans %}">
-                                    <a href="#">{% trans %}Toggle Scrolling{% endtrans %}</a>
+                                    <a aria-label="list item 2, toggle scrolling" href="#">{% trans %}Toggle Scrolling{% endtrans %}</a>
                                 </li>
                                 <li id="clear_current_output"
                                     title="{% trans %}Clear the output of the current cell{% endtrans %}">
-                                    <a href="#">{% trans %}Clear{% endtrans %}</a>
+                                    <a aria-label="list item 3, clear" href="#">{% trans %}Clear{% endtrans %}</a>
                                 </li>
                             </ul>
                         </li>
-                        <li id="all_outputs" class="dropdown-submenu"><a href="#">{% trans %}All Output{% endtrans %}</a>
+                        <li id="all_outputs" class="dropdown-submenu"><a aria-label="list item 9, all output" href="#">{% trans %}All Output{% endtrans %}</a>
                             <ul class="dropdown-menu">
                                 <li id="toggle_all_output"
                                     title="{% trans %}Hide/Show the output of all cells{% endtrans %}">
-                                    <a href="#">{% trans %}Toggle{% endtrans %}</a>
+                                    <a aria-label="list item 1, toggle" href="#">{% trans %}Toggle{% endtrans %}</a>
                                 </li>
                                 <li id="toggle_all_output_scroll"
                                     title="{% trans %}Scroll the output of all cells{% endtrans %}">
-                                    <a href="#">{% trans %}Toggle Scrolling{% endtrans %}</a>
+                                    <a aria-label="list item 2, toggle scrolling" href="#">{% trans %}Toggle Scrolling{% endtrans %}</a>
                                 </li>
                                 <li id="clear_all_output"
                                     title="{% trans %}Clear the output of all cells{% endtrans %}">
-                                    <a href="#">{% trans %}Clear{% endtrans %}</a>
+                                    <a aria-label="list item 3, clear" href="#">{% trans %}Clear{% endtrans %}</a>
                                 </li>
                             </ul>
                         </li>
@@ -258,31 +258,31 @@ data-notebook-path="{{notebook_path | urlencode}}"
                     <ul id="kernel_menu" class="dropdown-menu">
                         <li id="int_kernel"
                             title="{% trans %}Send Keyboard Interrupt (CTRL-C) to the Kernel{% endtrans %}">
-                            <a href="#">{% trans %}Interrupt{% endtrans %}</a>
+                            <a aria-label="list item 1, Interrupt" href="#">{% trans %}Interrupt{% endtrans %}</a>
                         </li>
                         <li id="restart_kernel"
                             title="{% trans %}Restart the Kernel{% endtrans %}">
-                            <a href="#">{% trans %}Restart{% endtrans %}</a>
+                            <a aria-label="list item 2, Restart" href="#">{% trans %}Restart{% endtrans %}</a>
                         </li>
                         <li id="restart_clear_output"
                             title="{% trans %}Restart the Kernel and clear all output{% endtrans %}">
-                            <a href="#">{% trans %}Restart &amp; Clear Output{% endtrans %}</a>
+                            <a aria-label="list item 3, restart and clear output" href="#">{% trans %}Restart &amp; Clear Output{% endtrans %}</a>
                         </li>
                         <li id="restart_run_all"
                             title="{% trans %}Restart the Kernel and re-run the notebook{% endtrans %}">
-                            <a href="#">{% trans %}Restart &amp; Run All{% endtrans %}</a>
+                            <a aria-label="list item 4, restart and run all" href="#">{% trans %}Restart &amp; Run All{% endtrans %}</a>
                         </li>
                         <li id="reconnect_kernel"
                             title="{% trans %}Reconnect to the Kernel{% endtrans %}">
-                            <a href="#">{% trans %}Reconnect{% endtrans %}</a>
+                            <a aria-label="list item 5, reconnect" href="#">{% trans %}Reconnect{% endtrans %}</a>
                         </li>
                         <li id="shutdown_kernel"
                             title="Shutdown the Kernel">
-                            <a href="#">{% trans %}Shutdown{% endtrans %}</a>
+                            <a aria-label="list item 6, shutdown" href="#">{% trans %}Shutdown{% endtrans %}</a>
                         </li>
                         <li class="divider"></li>
                         <li id="menu-change-kernel" class="dropdown-submenu">
-                            <a href="#">{% trans %}Change kernel{% endtrans %}</a>
+                            <a aria-label="list item 7, change kernel" href="#">{% trans %}Change kernel{% endtrans %}</a>
                             <ul class="dropdown-menu" id="menu-change-kernel-submenu"></ul>
                         </li>
                     </ul>
@@ -290,9 +290,9 @@ data-notebook-path="{{notebook_path | urlencode}}"
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans %}Help{% endtrans %}</a>
                     <ul  id="help_menu" class="dropdown-menu">
                         {% block help %}
-                        <li id="notebook_tour" title="{% trans %}A quick tour of the notebook user interface{% endtrans %}"><a href="#">{% trans %}User Interface Tour{% endtrans %}</a></li>
-                        <li id="keyboard_shortcuts" title="{% trans %}Opens a tooltip with all keyboard shortcuts{% endtrans %}"><a href="#">{% trans %}Keyboard Shortcuts{% endtrans %}</a></li>
-                        <li id="edit_keyboard_shortcuts" title="{% trans %}Opens a dialog allowing you to edit Keyboard shortcuts{% endtrans %}"><a href="#">{% trans %}Edit Keyboard Shortcuts{% endtrans %}</a></li>
+                        <li id="notebook_tour" title="{% trans %}A quick tour of the notebook user interface{% endtrans %}"><a aria-label="list item 1, user interface tour href="#">{% trans %}User Interface Tour{% endtrans %}</a></li>
+                        <li id="keyboard_shortcuts" title="{% trans %}Opens a tooltip with all keyboard shortcuts{% endtrans %}"><a aria-label="list item 2, keyboard shortcuts" href="#">{% trans %}Keyboard Shortcuts{% endtrans %}</a></li>
+                        <li id="edit_keyboard_shortcuts" title="{% trans %}Opens a dialog allowing you to edit Keyboard shortcuts{% endtrans %}"><a aria-label="list item 3, edit keyboard shortcuts" href="#">{% trans %}Edit Keyboard Shortcuts{% endtrans %}</a></li>
                         <li class="divider"></li>
                         {% set
                             sections = (
@@ -319,7 +319,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                             {% endif %}
                         {% endfor %}
                         <li class="divider"></li>
-                        <li title="{% trans %}About Jupyter Notebook{% endtrans %}"><a id="notebook_about" href="#">{% trans %}About{% endtrans %}</a></li>
+                        <li title="{% trans %}About Jupyter Notebook{% endtrans %}"><a aria-label="list item 4, about" id="notebook_about" href="#">{% trans %}About{% endtrans %}</a></li>
                         {% endblock %}
                     </ul>
                 </li>
diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index d84a973c1..d59e3e27e 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -71,18 +71,18 @@ data-server-root="{{server_root}}"
                     <li role="presentation" class="divider"></li>
                     <li role="presentation" class="dropdown-header" >Other:</li>
                     <li role="presentation" id="new-file">
-                      <a role="menuitem" tabindex="-1" href="#">{% trans %}Text File{% endtrans %}</a>
+                      <a role="menuitem" aria-label="list item 2, Text file" tabindex="-1" href="#">{% trans %}Text File{% endtrans %}</a>
                     </li>
                     <li role="presentation" id="new-folder">
-                      <a role="menuitem" tabindex="-1" href="#">{% trans %}Folder{% endtrans %}</a>
+                      <a role="menuitem" aria-label="list item 3, Folder" tabindex="-1" href="#">{% trans %}Folder{% endtrans %}</a>
                     </li>
                     {% if terminals_available %}
                     <li role="presentation" id="new-terminal">
-                      <a role="menuitem" tabindex="-1" href="#">{% trans %}Terminal{% endtrans %}</a>
+                      <a role="menuitem" aria-label="list item 4, Terminal" tabindex="-1" href="#">{% trans %}Terminal{% endtrans %}</a>
                     </li>
                     {% else %}
                     <li role="presentation" id="new-terminal-disabled" class="disabled">
-                      <a role="menuitem" tabindex="-1" href="#">{% trans %}Terminals Unavailable{% endtrans %}</a>
+                      <a role="menuitem" aria-label="list item 5, Terminals Unavailable" tabindex="-1" href="#">{% trans %}Terminals Unavailable{% endtrans %}</a>
                     </li>
                     {% endif %}
                   </ul>
@@ -104,10 +104,10 @@ data-server-root="{{server_root}}"
                   <span class="sr-only">Toggle Dropdown</span>
                 </button>
                 <ul id='selector-menu' class="dropdown-menu" role="menu" aria-labelledby="tree-selector-btn">
-                  <li role="presentation"><a id="select-folders" role="menuitem" tabindex="-1" href="#" title="{% trans %}Select All Folders{% endtrans %}"><i class="menu_icon folder_icon icon-fixed-width"></i>&nbsp;{% trans %}Folders{% endtrans %}</a></li>
-                  <li role="presentation"><a id="select-notebooks" role="menuitem" tabindex="-1" href="#" title="{% trans %}Select All Notebooks{% endtrans %}"><i class="menu_icon notebook_icon icon-fixed-width"></i>&nbsp;{% trans %}All Notebooks{% endtrans %}</a></li>
-                  <li role="presentation"><a id="select-running-notebooks" role="menuitem" tabindex="-1" href="#" title="{% trans %}Select Running Notebooks{% endtrans %}"><i class="menu_icon running_notebook_icon icon-fixed-width"></i>&nbsp;{% trans %}Running{% endtrans %}</a></li>
-                  <li role="presentation"><a id="select-files" role="menuitem" tabindex="-1" href="#" title="{% trans %}Select All Files{% endtrans %}"><i class="menu_icon file_icon icon-fixed-width"></i>&nbsp;{% trans %}Files{% endtrans %}</a></li>
+                  <li role="presentation"><a id="select-folders" aria-label="list item 1, Folders" role="menuitem" tabindex="-1" href="#" title="{% trans %}Select All Folders{% endtrans %}"><i class="menu_icon folder_icon icon-fixed-width"></i>&nbsp;{% trans %}Folders{% endtrans %}</a></li>
+                  <li role="presentation"><a id="select-notebooks" aria-label="list item 2, All Notebooks" role="menuitem" tabindex="-1" href="#" title="{% trans %}Select All Notebooks{% endtrans %}"><i class="menu_icon notebook_icon icon-fixed-width"></i>&nbsp;{% trans %}All Notebooks{% endtrans %}</a></li>
+                  <li role="presentation"><a id="select-running-notebooks" aria-label="list item 3, Running" role="menuitem" tabindex="-1" href="#" title="{% trans %}Select Running Notebooks{% endtrans %}"><i class="menu_icon running_notebook_icon icon-fixed-width"></i>&nbsp;{% trans %}Running{% endtrans %}</a></li>
+                  <li role="presentation"><a id="select-files" role="menuitem" aria-label="list item 4, Files" tabindex="-1" href="#" title="{% trans %}Select All Files{% endtrans %}"><i class="menu_icon file_icon icon-fixed-width"></i>&nbsp;{% trans %}Files{% endtrans %}</a></li>
                 </ul>
               </div>
               <div id="project_name">