diff --git a/public/assets/css/base.css b/public/assets/css/base.css
index 72ee066beb..2aff977219 100644
--- a/public/assets/css/base.css
+++ b/public/assets/css/base.css
@@ -247,9 +247,7 @@ summary:hover .icon-details-open {
     text-decoration: underline;
 }
 .h-entry a:focus {
-    animation-name: highlight;
-    animation-duration: 500ms;
-    animation-timing-function: ease-in-out;
+    border: solid 2px var(--bg3);
 }
 
 .h-entry .embed header {
@@ -479,7 +477,7 @@ input {
     display: block;
     position: relative;
     color: var(--white);
-    padding: 2px 8px;
+    padding: 2px 6px;
     border: 2px solid var(--bg2) !important;
     border-radius: var(--unit-size) !important;
     background-color: var(--translucent);
@@ -575,35 +573,35 @@ input[type=file] {
 }
 
 /* ACCESSIBILITY MENU */
-.accessibility-menu {
+#accessibility-menu {
     display: block;
     position: absolute;
     z-index: 999;
 
-    top: -100%;
-    left: -100%;
-    width: 1px;
-    height: 1px;
-}
+    top: -90%;
+    left: -90%;
 
-.accessibility-menu ul {
-    list-style-type: disc;
-}
-
-#anchor-menu:target + .accessibility-menu:focus-within,
-.accessibility-menu:focus-within {
-    top: var(--unit-size);
-    left: var(--unit-size);
     width: 30%;
     height: min-content;
 
     background-color: var(--bg1);
     padding: var(--unit-size);
+
     border: solid 2px var(--bg3);
     border-radius: var(--unit-size);
     box-shadow: var(--shadow);
 }
 
+#accessibility-menu ul {
+    list-style-type: disc;
+    margin-left: var(--medium-size);
+}
+
+#accessibility-menu:focus-within {
+    top: var(--unit-size);
+    left: var(--unit-size);
+}
+
 .anchor-hidden {
     width: 1px;
     height: 1px;
@@ -684,7 +682,7 @@ input[type=file] {
         max-width: 20%;
     }
 
-    a[id|="anchor"]:target + * {
+    a[id|="anchor"]:target + .accessibility-target {
         animation-name: highlight;
         animation-duration: 600ms;
         animation-timing-function: ease-in-out;
@@ -710,7 +708,7 @@ input[type=file] {
     #panel-left-toggle:checked ~ .panel-content,
     #panel-right-toggle:checked ~ .panel-content,
     a[id|="anchor"]:target ~ .panel-content {
-        display: flex !important;
+        display: flex;
 
         width: 100%;
         background-color: var(--bg2);
diff --git a/templates/base.html.twig b/templates/base.html.twig
index a1a6619fa6..87d5f8a76d 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -33,10 +33,11 @@
 
 <body class="bg">
 
-<a id="anchor-menu" href="#anchor-menu" class="anchor-hidden" aria-describedby="#accessibility-menu-title"></a>
-<aside class="accessibility-menu" aria-live="polite">
+<aside id="accessibility-menu" aria-live="polite">
+    <a accesskey="z" href="#accessibility-menu" class="anchor-hidden"></a>
+
     <h2 id="accessibility-menu-title" tabindex="0">{{ 'Accessibility menu.' | trans }}</h2>
-    <a href="#anchor-menu" accesskey="z">{{ 'Accessibility menu. Here you can find fast shortcuts to various page regions!' | trans }}</a>
+    <h3>{{ 'Here you can find fast shortcuts to various page regions!' | trans }}</h3>
 
     <br>
 
@@ -70,7 +71,7 @@
         {{ block("leftpanel", "stdgrid.html.twig") }}
 
         <a role="navigation" rel="help" id="anchor-main-page" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
-        <a id='instance' href="{{ path('main_public') }}" tabindex="0" title="{{ 'This instance\'s name. Access public timeline.' | trans }}">
+        <a class="accessibility-target" id='instance' href="{{ path('main_public') }}" tabindex="0" title="{{ 'This instance\'s name. Access public timeline.' | trans }}">
             <h1>{{ icon('logo', 'icon icon-logo') | raw }}{{ config('site', 'name') }} </h1>
         </a>
 
@@ -82,7 +83,7 @@
 
 <div class="container">
     <a role="navigation" rel="help" id="anchor-main-content" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
-    <div class='content'>
+    <div class='content accessibility-target'>
         {% block nav %}{% endblock %}
         {% block body %}{% endblock %}
         {% block javascripts %}{% endblock javascripts %}
diff --git a/templates/note/view.html.twig b/templates/note/view.html.twig
index d53d3cdb81..2f48fc30de 100644
--- a/templates/note/view.html.twig
+++ b/templates/note/view.html.twig
@@ -33,7 +33,7 @@
         </div>
         {% endif %}
     </header>
-    <div tabindex="0" class="e-content entry-content note-content" title="{{ 'This note\'s content.' | trans }}" aria-relevant="all">
+    <section tabindex="0" role="dialog" class="e-content entry-content note-content">
         {% block markdown %}
             {% apply markdown_to_html %}
                 {{ note.getContent() }}
@@ -51,14 +51,14 @@
                 {% endfor %}
             </div>
         {% endif %}
-        <div class="note-links" title="{{ 'Shared links in this note.' | trans }}">
+        <div tabindex="0" class="note-links" title="{{ 'Shared links in this note.' | trans }}">
             {% for link in note.getLinks() %}
                 {% for block in handle_event('ViewLink', {'link': link, 'note': note}) %}
                     {{ block | raw }}
                 {% endfor %}
             {% endfor %}
         </div>
-    </div>
+    </section>
 
     {% if replies is defined and replies is not empty %}
         <div class="u-in-reply-to replies">
diff --git a/templates/sidepanel/left/left.html.twig b/templates/sidepanel/left/left.html.twig
index 0fa946c16c..0c5eeef531 100644
--- a/templates/sidepanel/left/left.html.twig
+++ b/templates/sidepanel/left/left.html.twig
@@ -3,11 +3,11 @@
     <label id="panel-left-icon" for="panel-left-toggle" aria-hidden="true" tabindex="-1">{{ icon('menu', 'icon icon-left') | raw }}</label>
 
     <a id="anchor-left-panel" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
-    <aside class="panel-content">
+    <aside class="panel-content accessibility-target">
         {% if app.user %}
             <section tabindex="0" class='profile' title="{{ 'Your profile information.' | trans }}">
-                <a id="user" href="{{ path('settings') }}">
-                    <img src='{{ user_avatar }}' title="{{ 'Your account\'s avatar.' | trans }}" class="icon icon-avatar">
+                <a id="user" href="{{ path('settings') }}" title="{{ 'Access main settngs.' | trans }}">
+                    <img src='{{ user_avatar }}' alt="{{ 'Your account\'s avatar.' | trans }}" class="icon icon-avatar">
                     <div id="user-info">
                         <strong id="user-nickname" title="{{ 'Your account\' nickname.' | trans }}">{{ user_nickname }}</strong>
 
@@ -21,7 +21,7 @@
                             {% endif %}
                         </nav>
 
-                        <section tabindex="0" id="user-stats" title="{{ 'Your account statistics.' | trans }}">
+                        <section id="user-stats" title="{{ 'Your account statistics.' | trans }}">
                             {% if user_followers %}<h2>{{ 'Followers' | trans }} {{ user_followers }}</h2> {% endif %}
                             {% if user_followed %}<h2>{{ 'Followed' | trans }} {{ user_followed }}</h2> {% endif %}
                         </section>
@@ -33,10 +33,10 @@
                 {% endfor %} #}
             </section>
 
-            <nav tabindex="0" class="profile-navigation" title="{{ 'Navigate through account related pages.' | trans }}" aria-relevant="all">
-                <a href='#' title="{{ 'Check your messages.' | trans }}">Messages</a>
+            <nav class="profile-navigation" title="{{ 'Navigate through account related pages.' | trans }}" aria-relevant="all">
+                <a href='{{ path('settings') }}' class='{{ active("replies") }}' title="{{ 'Your messages.' | trans }}">Messages</a>
                 <a href="{{ path("replies", {'nickname' : user_nickname}) }}"
-                   class='hover-effect {{ active("replies") }}' title="{{ 'Replies to your notes.' | trans }}">Replies</a>
+                   class='{{ active("replies") }}' title="{{ 'Replies to your notes.' | trans }}">Replies</a>
                 {% for link in handle_event('InsertLeftPanelLink', user_nickname) %}
                     {{ link | raw }}
                 {% endfor %}
@@ -46,7 +46,7 @@
             </nav>
 
         {% else %}
-            <nav tabindex="0" class="profile-navigation" title="{{ 'Navigate through account related pages.' | trans }}" aria-relevant="all">
+            <nav class="profile-navigation" title="{{ 'Navigate through account related pages.' | trans }}" aria-relevant="all">
                 <a href="{{ path('login') }}" class='hover-effect {{ active('login') }}' title="{{ 'Login with your existing account.' | trans }}">Login</a>
                 <a href="{{ path('register') }}" title="{{ 'Register a new account!' | trans }}">Register</a>
             </nav>
diff --git a/templates/sidepanel/right/right.html.twig b/templates/sidepanel/right/right.html.twig
index 661d6f5993..e564cf2b07 100644
--- a/templates/sidepanel/right/right.html.twig
+++ b/templates/sidepanel/right/right.html.twig
@@ -1,9 +1,9 @@
-<div class="panel panel-right" tabindex="-1">
+<div class="panel panel-right">
     <input type="checkbox" id="panel-right-toggle" aria-hidden="true" tabindex="-1">
     <label id="panel-right-icon" for="panel-right-toggle" aria-hidden="true" tabindex="-1">{{ icon('notes', 'icon icon-right') | raw }}</label>
 
     <a id="anchor-right-panel" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
-    <aside class="panel-content">
+    <aside class="panel-content accessibility-target">
 
         {% if post_form is defined %}
             <section class="section-widget" title={{ 'Create a new note.' | trans }}>
