diff --git a/src/css/style.css b/src/css/style.css
index a4c5957..fbb9a29 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -20,7 +20,7 @@ body {
     margin-right: 0.5em
 }
 
-.language-switcher .dropdown-item {
+.dropdown-menu .dropdown-item {
     cursor: pointer;
 }
 
diff --git a/src/private/templates/body.latte b/src/private/templates/body.latte
index f94be63..b0d0af8 100644
--- a/src/private/templates/body.latte
+++ b/src/private/templates/body.latte
@@ -85,20 +85,22 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
                 </li>
             </ul>
             <ul class="navbar-nav ml-md-auto">
-                <li class="nav-item">
-                    {if $auth::isLoggedIn()}
-                        <li class="nav-item dropdown">
-                            <a class="nav-link login-button text-truncate dropdown-toggle" href="#" id="navbarDropdownUser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                <i class="fas fa-user"></i>{$auth::getNickname()}
-                            </a>
-                            <div class="dropdown-menu language-switcher" aria-labelledby="navbarDropdownUser">
-                                <button class="dropdown-item logoutUser"><i class="fas fa-sign-out-alt"></i>{_"NAV_ACCOUNT_LOGOUT"}</button>
-                            </div>
-                        </li>
-                    {else}
+
+                {if $auth::isLoggedIn()}
+                    <li class="nav-item dropdown">
+                        <a class="nav-link login-button text-truncate dropdown-toggle" href="#" id="navbarDropdownUser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <i class="fas fa-user"></i>{$auth::getNickname()}
+                        </a>
+                            <div class="dropdown-menu" aria-labelledby="navbarDropdownUser">
+                            <button class="dropdown-item logoutUser"><i class="fas fa-sign-out-alt"></i>{_"NAV_ACCOUNT_LOGOUT"}</button>
+                        </div>
+                    </li>
+                {else}
+                    <li class="nav-item">
                         <a class="nav-link" href="#" data-openLoginModal><i class="fas fa-sign-in-alt"></i>{_"NAV_ACCOUNT_LOGIN"}</a>
-                    {/if}
-                </li>
+                    </li>
+                {/if}
+
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownLanguageChooser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="fas fa-language"></i>{$userLanguage->getLanguageNameNative()}
@@ -107,7 +109,7 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
                         {$csrfField}
                         <input type="hidden" name="return-to" value="{$_SERVER['PHP_SELF']}">
 
-                        <div class="dropdown-menu language-switcher" aria-labelledby="navbarDropdownLanguageChooser">
+                        <div class="dropdown-menu" aria-labelledby="navbarDropdownLanguageChooser">
                             <button name="lang" class="dropdown-item{if $lang->getLanguageCode() === $userlangcode} active{/if}"
                                 n:foreach="$languageList as $lang"
                                 n:attr="value => $lang->getLanguageCode(), title => $lang->getLanguageNameEnglish()">
diff --git a/src/private/templates/utils/modal-login.latte b/src/private/templates/utils/modal-login.latte
index cdc3990..481d1fd 100644
--- a/src/private/templates/utils/modal-login.latte
+++ b/src/private/templates/utils/modal-login.latte
@@ -77,9 +77,9 @@
                             <div class="input-group-append">
                                 <button class="btn btn-secondary">Send</button>
                             </div>
-                        </div>
-                        <div class="invalid-feedback">
-                            Invalid confirmation code, try again.
+                            <div class="invalid-feedback">
+                                Invalid confirmation code, try again.
+                            </div>
                         </div>
                     </form>
                 </div>