diff --git a/app/AccountancyModule/Components/templates/LoginPanel.latte b/app/AccountancyModule/Components/templates/LoginPanel.latte
index 4f9b42e5c..fc93de97d 100644
--- a/app/AccountancyModule/Components/templates/LoginPanel.latte
+++ b/app/AccountancyModule/Components/templates/LoginPanel.latte
@@ -1,5 +1,5 @@
 {if $user->isLoggedIn()}
-    <span id="timer" class="mr-3 w-auto small p-1 rounded">
+    <span id="timer" class="mr-3 w-auto small p-1 rounded text-nowrap">
         <i class="far fa-clock"></i>
         <span id="timer-minutes"></span>
     </span>
@@ -14,7 +14,7 @@
         </span>
     </span>
 
-    <a href="{plink :Auth:logoutSis}" class="btn btn-sm btn-secondary my-2 my-sm-0">Odhlásit se</a>
+    <a href="{plink :Auth:logoutSis}" class="btn btn-sm btn-secondary my-2 my-sm-0 text-nowrap">Odhlásit se</a>
 {else}
-    <a href="{plink :Auth:logOnSkautIs (isset($backlink)) ? $backlink : NULL}" class="btn btn-sm btn-primary my-2 my-sm-0">Přihlásit se</a>
+    <a href="{plink :Auth:logOnSkautIs (isset($backlink)) ? $backlink : NULL}" class="btn btn-sm btn-primary my-2 my-sm-0 text-nowrap">Přihlásit se</a>
 {/if}
diff --git a/app/templates/@layout.latte b/app/templates/@layout.latte
index 7f85cc5ca..f2e597abe 100644
--- a/app/templates/@layout.latte
+++ b/app/templates/@layout.latte
@@ -46,7 +46,7 @@
                             <a class="nav-link" n:href=":Accountancy:Camp:Default:">Tábory</a>
                         </li>
                         <li n:class="nav-item, $module === 'Education' ? active">
-                            <a class="nav-link" n:href=":Accountancy:Education:Default:">Vzdělávačky<sup> <span class="badge badge-warning">Beta</span></sup></a>
+                            <a class="nav-link text-nowrap" n:href=":Accountancy:Education:Default:">Vzdělávačky<sup> <span class="badge badge-warning">Beta</span></sup></a>
                         </li>
                         <li n:class="nav-item, $module === 'Travel' ? active">
                             <a class="nav-link" n:href=":Accountancy:Travel:Default:">Cesťáky</a>
@@ -63,7 +63,7 @@
                         </li>
                     {/if}
                 </ul>
-                <div class="my-2 my-lg-0">
+                <div class="my-2 my-lg-0 d-flex flex-row">
                     {control loginPanel}
                 </div>
             </div>