diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index db4b14c2..2963e981 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -47,7 +47,10 @@ nav{
 }
 
 .menu-elem{
+    /*
     border-left: 1px solid white;
+    */
+    margin: 0 0 0 0.75rem;
 }
 
 .menu-elem:hover{
@@ -59,4 +62,7 @@ nav{
 .nav-btn{
     color: white;
     padding: 0.5rem;
+}
+.nav-btn:hover{
+    color: var(--rlp-gray-light);
 }
\ No newline at end of file
diff --git a/templates/navbar.html b/templates/navbar.html
index 32c493e6..37343fca 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -6,35 +6,34 @@
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
             <li class="nav-item menu-elem">
-                <a class="nav-btn btn nav-link" href="{% url 'home' %}">
+                <a class="nav-btn nav-link" href="{% url 'home' %}">
                     {% fa5_icon 'home' %}
                     {% trans 'Home' %}
                 </a>
             </li>
             <li class="nav-item menu-elem">
-                <a class="nav-btn btn nav-link" href="{% url 'home' %}">
+                <a class="nav-btn nav-link" href="{% url 'home' %}">
                     {% fa5_icon 'pencil-ruler' %}
                     {% trans 'Intervention' %}
                 </a>
             </li>
             <li class="nav-item menu-elem">
-                <a class="nav-btn btn nav-link" href="{% url 'home' %}">
+                <a class="nav-btn nav-link" href="{% url 'home' %}">
                     {% fa5_icon 'leaf' %}
                     {% trans 'Compensation' %}
                 </a>
             </li>
             <li class="nav-item menu-elem">
-                <a class="nav-btn btn nav-link" href="{% url 'home' %}">
+                <a class="nav-btn nav-link" href="{% url 'home' %}">
                     {% fa5_icon 'tree' %}
                     {% trans 'Eco-account' %}
                 </a>
             </li>
             <li class="nav-item menu-elem dropdown" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                <a class="nav-btn btn nav-link">
+                <a class="nav-btn nav-link">
                     {% fa5_icon 'ellipsis-v' %}
                     {% trans 'More' %}
                 </a>
@@ -47,15 +46,17 @@
             </li>
 
         </ul>
-        <div class="nav-item dropdown">
-            <div class="btn nav-btn"  data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                {% fa5_icon 'user-circle' %}
-                {{ user.username }}
-            </div>
-            <div class="dropdown-menu dropdown-menu-right">
-                <a class="dropdown-item" href="{% url 'logout' %}">{% fa5_icon 'cogs' %}  {% trans 'Settings' %}</a>
-                <a class="dropdown-item" href="{% url 'logout' %}">{% fa5_icon 'sign-out-alt' %}  {% trans 'Logout' %}</a>
-            </div>
-        </div>
+        <ul class="navbar-nav ml-auto">
+            <li class="nav-item dropdown">
+                <div class="btn nav-btn"  data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                    {% fa5_icon 'user-circle' %}
+                    {{ user.username }}
+                </div>
+                <div class="dropdown-menu dropdown-menu-right">
+                    <a class="dropdown-item" href="{% url 'logout' %}">{% fa5_icon 'cogs' %}  {% trans 'Settings' %}</a>
+                    <a class="dropdown-item" href="{% url 'logout' %}">{% fa5_icon 'sign-out-alt' %}  {% trans 'Logout' %}</a>
+                </div>
+            </li>
+        </ul>
     </div>
 </nav>
\ No newline at end of file