diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index a2a868699..2843db96d 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -7,11 +7,11 @@
 
             <div class="collapse navbar-collapse">
             @auth
-                <ul class="navbar-nav d-none d-md-block mx-auto">
+                <div class="navbar-nav d-none d-md-block mx-auto">
                   <form class="form-inline search-bar" method="get" action="/i/results">
-                    <input class="form-control form-control-sm" name="q" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off" required style="line-height: 0.6;width:200px">
+                    <input class="form-control form-control-sm" name="q" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off" required style="line-height: 0.6;width:200px" role="search">
                   </form>
-                </ul>
+                </div>
             @endauth
 
             @guest
@@ -32,23 +32,22 @@
             @else
                 <div class="ml-auto">
                     <ul class="navbar-nav">
-                        <div class="d-none d-md-block">
-                            <li class="nav-item px-md-2">
-                                <a class="nav-link font-weight-bold text-muted" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
-                                    <i class="far fa-compass fa-lg"></i>
-                                </a>
-                            </li>
-                        </div>
-                        <div class="d-none d-md-block">
-                            <li class="nav-item px-md-2">
-                                <a class="nav-link font-weight-bold text-muted" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
-                                    <i class="far fa-bell fa-lg"></i>
-                                </a>
-                            </li>
-                        </div>
+                        <li class="nav-item px-md-2 d-none d-md-block">
+                            <a class="nav-link font-weight-bold text-muted" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
+                                <i class="far fa-compass fa-lg"></i>
+                                <span class="sr-only">Discover</span>
+                            </a>
+                        </li>
+                        <li class="nav-item px-md-2 d-none d-md-block">
+                            <a class="nav-link font-weight-bold text-muted" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
+                                <i class="far fa-bell fa-lg"></i>
+                                <span class="sr-only">Notifications</span>
+                            </a>
+                        </li>
                         <li class="nav-item dropdown ml-2">
                             <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
                                 <i class="far fa-user fa-lg text-muted"></i>
+                                <span class="sr-only">User Menu</span>
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">