diff --git a/ihatemoney/static/css/main.css b/ihatemoney/static/css/main.css
index 73ea5136..49e8999b 100644
--- a/ihatemoney/static/css/main.css
+++ b/ihatemoney/static/css/main.css
@@ -27,6 +27,12 @@ body {
   font-family: "Lobster", arial, serif;
 }
 
+@media (min-width: 992px) {
+  .projects-item {
+    margin-left: auto!important;
+  }
+}
+
 /* Header */
 
 #header {
@@ -189,6 +195,12 @@ footer .footer-right a {
   border-radius: 50%;
   opacity: 0.5;
 }
+@-moz-document url-prefix() {
+  /** Firefox style fix **/
+  footer .footer-right a {
+    padding-top: 2px
+  }
+}
 footer .footer-right a:hover {
   opacity: 1;
 }
diff --git a/ihatemoney/static/images/git.svg b/ihatemoney/static/images/git.svg
new file mode 100644
index 00000000..240616d7
--- /dev/null
+++ b/ihatemoney/static/images/git.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="git-alt" class="svg-inline--fa fa-git-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M439.55 236.05L244 40.45a28.87 28.87 0 0 0-40.81 0l-40.66 40.63 51.52 51.52c27.06-9.14 52.68 16.77 43.39 43.68l49.66 49.66c34.23-11.8 61.18 31 35.47 56.69-26.49 26.49-70.21-2.87-56-37.34L240.22 199v121.85c25.3 12.54 22.26 41.85 9.08 55a34.34 34.34 0 0 1-48.55 0c-17.57-17.6-11.07-46.91 11.25-56v-123c-20.8-8.51-24.6-30.74-18.64-45L142.57 101 8.45 235.14a28.86 28.86 0 0 0 0 40.81l195.61 195.6a28.86 28.86 0 0 0 40.8 0l194.69-194.69a28.86 28.86 0 0 0 0-40.81z"></path></svg>
\ No newline at end of file
diff --git a/ihatemoney/static/images/github.svg b/ihatemoney/static/images/github.svg
deleted file mode 100644
index 7870c06d..00000000
--- a/ihatemoney/static/images/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>
\ No newline at end of file
diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html
index 5f61949c..90bd0324 100644
--- a/ihatemoney/templates/layout.html
+++ b/ihatemoney/templates/layout.html
@@ -32,34 +32,6 @@
       <span class="navbar-toggler-icon"></span>
     </button>
     <h1><a class="navbar-brand" href="{{ url_for("main.home") }}">#! money?</a></h1>
-    {% if g.project %}
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item dropdown">
-        <a href="#" class="nav-link dropdown-toggle" id="navbarProjectsLinks" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <strong class="text-white">{{ g.project.name }}</strong>
-          <b class="caret"></b>
-        </a>
-        <ul class="dropdown-menu" aria-labelledby="navbarProjectsLinks">
-          <li>
-            <a class="dropdown-item" href="{{ url_for("main.create_project") }}">
-              <i class="icon plus">{{ static_include("images/plus.svg") | safe }}</i>
-              {{ _("Start a new project") }}
-            </a>
-          </li>
-
-          {% if (session['projects'] | length) > 1 %}
-          <li class="dropdown-divider"></li>
-          <li class="dropdown-header">{{ _('Other projects :') }}</li>
-            {% for id, name in session['projects'] %}
-              {% if id != g.project.id %}
-              <li><a class="dropdown-item" href="{{ url_for("main.list_bills", project_id=id) }}">{{ _("switch to") }} {{ name }}</a></li>
-              {% endif %}
-            {% endfor %}
-          {% endif %}
-        </ul>
-      </li>
-    </ul>
-    {% endif %}
 
     <div class="collapse navbar-collapse" id="navbarToggler">
       <ul class="navbar-nav ml-auto mr-auto">
@@ -68,7 +40,7 @@
           <li class="nav-item{% if current_view == 'list_bills' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.list_bills") }}">{{ _("Bills") }}</a></li>
           <li class="nav-item{% if current_view == 'settle_bill' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.settle_bill") }}">{{ _("Settle") }}</a></li>
           <li class="nav-item{% if current_view == 'statistics' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.statistics") }}">{{ _("Statistics") }}</a></li>
-          <li class="nav-item{% if current_view == 'edit_project' %} active{% endif %}""><a class="nav-link" href="{{ url_for("main.edit_project") }}">{{ _("Settings") }}</a></li>
+          <li class="nav-item{% if current_view == 'edit_project' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.edit_project") }}">{{ _("Settings") }}</a></li>
           {% endblock %}
         {% endif %}
       </ul>
@@ -92,11 +64,48 @@
               {% endfor %}
           </div>
         </li>
-        {% if (session['projects'] | length) > 0 or session['is_admin'] %}
-        <li class="nav-item">
-          <a class="nav-link" href="{{ url_for("main.exit") }}">{{ _("Logout") }}</a>
+        {% if g.project or (session['projects'] | length) > 0 or session['is_admin'] %}
+        <li class="nav-item dropdown projects-item">
+          <a href="#" class="nav-link dropdown-toggle" id="navbarProjectsLinks" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <strong class="text-white">
+              {% if g.project %}
+                {{ g.project.name }}
+              {% else %}
+                {{_('Projects')}}
+              {% endif %}
+            </strong>
+            <b class="caret"></b>
+          </a>
+          <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarProjectsLinks">
+            <li>
+              <a class="dropdown-item" href="{{ url_for("main.create_project") }}">
+                <i class="icon plus">{{ static_include("images/plus.svg") | safe }}</i>
+                {{ _("Start a new project") }}
+              </a>
+            </li>
+
+
+            {% if session['projects'] and not ((session['projects'] | length) == 1 and g.project and session['projects'][0][0] == g.project.id) %}
+            <li class="dropdown-divider"></li>
+            <li class="dropdown-header">{{ _('Other projects :') }}</li>
+              {% for id, name in session['projects'] %}
+                {% if not g.project or id != g.project.id %}
+                <li><a class="dropdown-item" href="{{ url_for("main.list_bills", project_id=id) }}">{{ _("switch to") }} {{ name }}</a></li>
+                {% endif %}
+              {% endfor %}
+            {% endif %}
+            <li class="dropdown-divider"></li>
+            {% if session['is_admin'] %}
+            <li><a class="dropdown-item" href="{{ url_for("main.dashboard") }}">{{ _("Dashboard") }}</a></li>
+            {% endif %}
+            <li>
+              <a class="dropdown-item" href="{{ url_for("main.exit") }}">
+                {{ _("Logout") }}
+              </a>
+            </li>
+          </ul>
         </li>
-        {% endif %}
+      {% endif %}
       </ul>
     </div>
   </nav>
@@ -121,7 +130,7 @@
 
           <div class="footer-right">
             <a target="_blank" rel="noopener" n data-toggle="tooltip" data-placement="top" title="{{ _('Code') }}" href="https://github.com/spiral-project/ihatemoney">
-              <i class="icon github">{{ static_include("images/github.svg") | safe }}</i>
+              <i class="icon git">{{ static_include("images/git.svg") | safe }}</i>
             </a>
             <a target="_blank" rel="noopener" n data-toggle="tooltip" data-placement="top" title="{{ _('Mobile Application') }}" href="https://gitlab.com/eneiluj/moneybuster">
               <i class="icon mobile">{{ static_include("images/mobile-alt.svg") | safe }}</i>