diff --git a/mayan/apps/appearance/templates/appearance/menu_main.html b/mayan/apps/appearance/templates/appearance/menu_main.html
index 6177408b67c..e18f5da8d84 100644
--- a/mayan/apps/appearance/templates/appearance/menu_main.html
+++ b/mayan/apps/appearance/templates/appearance/menu_main.html
@@ -8,7 +8,7 @@
     <div class="panel-group" id="accordion-sidebar" role="tablist" aria-multiselectable="true">
         <div class="panel-heading" role="tab" id="menu-main-button-close">
             <h4 class="panel-title">
-                <a class="disabled" href="">
+                <a class="disabled" href="#/">
                     <i class="fa fa-angle-double-left"></i>
                 </a>
             </h4>
@@ -18,12 +18,12 @@ <h4 class="panel-title">
             {% for link_group in main_menu_results.link_groups %}
                 {% for link in link_group.links %}
                     {% with 'active' as li_class_active %}
-                    {% with ' ' as link_classes %}
+                    {% with '' as link_classes %}
                         {% if link|common_get_type == "<class 'mayan.apps.navigation.classes.Menu'>" %}
                             <div class="panel panel-default">
-                                <div class="panel-heading" role="tab" id="headingOne">
+                                <div class="panel-heading" role="tab" id={{ link.label }}> <!-- ######## -->
                                     <h4 class="panel-title">
-                                        <a class="non-ajax collapsed" role="button" data-toggle="collapse" data-parent="#accordion-sidebar" href="#accordion-body-{{ forloop.counter }}" aria-expanded="false" aria-controls="collapseOne">
+                                        <a class="non-ajax collapsed" role="button" data-toggle="collapse" data-parent="#accordion-sidebar" href="#accordion-body-{{ forloop.counter }}"  aria-expanded="false" aria-controls="collapseOne">
                                             <div class="pull-left">
                                                 {% if link.icon %}
                                                 <i class="hidden-xs hidden-sm hidden-md {{ link.icon }}"></i>
@@ -36,7 +36,7 @@ <h4 class="panel-title">
                                         </a>
                                     </h4>
                                 </div>
-                                <div id="accordion-body-{{ forloop.counter }}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+                                <div id="accordion-body-{{ forloop.counter }}" class="panel-collapse collapse" role="tabpanel" aria-labelledby={{ link.label }}>
                                     <div class="panel-body">
                                         <ul class="list-unstyled">
                                             {% navigation_resolve_menu name=link.name as sub_menus_results %}
@@ -59,7 +59,7 @@ <h4 class="panel-title">
                             </div>
                         {% else %}
                             <div class="panel panel-default">
-                                <div class="panel-heading" role="tab" id="headingOne">
+                                <div class="panel-heading" role="tab" id={{ link.label }}>
                                     <h4 class="panel-title">
                                         {% include 'navigation/generic_link_instance.html' %}
                                     </h4>
diff --git a/mayan/apps/appearance/templates/appearance/menu_topbar.html b/mayan/apps/appearance/templates/appearance/menu_topbar.html
index 7c995339601..26dfd55ae9d 100644
--- a/mayan/apps/appearance/templates/appearance/menu_topbar.html
+++ b/mayan/apps/appearance/templates/appearance/menu_topbar.html
@@ -26,7 +26,7 @@
                                 {% with 'true' as hide_active_anchor %}
                                 {% with 'active' as li_class_active %}
                                 {% with 'first' as li_class_first %}
-                                {% with ' ' as link_classes %}
+                                {% with '' as link_classes %}
                                     {% include 'navigation/generic_subnavigation.html' %}
                                 {% endwith %}
                                 {% endwith %}
diff --git a/mayan/apps/navigation/templates/navigation/generic_link_instance.html b/mayan/apps/navigation/templates/navigation/generic_link_instance.html
index c849e374937..f7ec0a6654a 100644
--- a/mayan/apps/navigation/templates/navigation/generic_link_instance.html
+++ b/mayan/apps/navigation/templates/navigation/generic_link_instance.html
@@ -7,12 +7,13 @@
         <a class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %} disabled" disabled='disabled' style="cursor: default;" href="#">{% if link.icon %}{{ link.icon.render }}{% endif %} {{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}</a>
     {% else %}
         <a
-            class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %}"
+            class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %} "
             {% for key,value in link.html_data.items %}
                 data-{{ key }}={{ value }}
             {% endfor %}
 
         href="{{ link.url }}"
+        aria-label = "{% if link.url == "/messaging/messages/" %} message {% elif link.url == "/events/user/notifications/" %} notification {% endif %}"
         >{% if link.icon and not hide_icon %}{{ link.icon.render }}{% endif %}
         {{ link.text|default:'' }}{% if link.badge_text %}&nbsp;<span class="badge">{{ link.badge_text }}</span>
         {% endif %}{% if link.error %} - {{ link.error }}{% endif %}