diff --git a/frontend/resources/styles/main/partials/dashboard-grid.scss b/frontend/resources/styles/main/partials/dashboard-grid.scss
index 7f274c71b..9ceedafd8 100644
--- a/frontend/resources/styles/main/partials/dashboard-grid.scss
+++ b/frontend/resources/styles/main/partials/dashboard-grid.scss
@@ -12,7 +12,6 @@
   height: 100%;
 
   .dashboard-title {
-    margin: $medium 0;
     position: relative;
     width: 100%;
 
diff --git a/frontend/resources/styles/main/partials/main-bar.scss b/frontend/resources/styles/main/partials/main-bar.scss
index 96364f0a1..0be476384 100644
--- a/frontend/resources/styles/main/partials/main-bar.scss
+++ b/frontend/resources/styles/main/partials/main-bar.scss
@@ -12,6 +12,7 @@
   display: flex;
   height: 40px;
   padding: $x-small $small;
+  padding-left: $x-big;
   position: relative;
   z-index: 10;
 
@@ -83,7 +84,6 @@
   display: flex;
   font-size: $fs15;
   font-weight: normal;
-  margin: 0 $x-big;
 }
 
 .user-zone {
diff --git a/frontend/src/uxbox/main/ui/dashboard/project.cljs b/frontend/src/uxbox/main/ui/dashboard/project.cljs
index dabbbc7db..5389b9100 100644
--- a/frontend/src/uxbox/main/ui/dashboard/project.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/project.cljs
@@ -52,25 +52,22 @@
                      (st/emit! (dsh/delete-project project-id))
                      (st/emit! (rt/nav :dashboard-team {:team-id team-id})))
         on-delete #(modal/show! confirm-dialog {:on-accept delete-fn})]
-    [:header#main-bar.main-bar
+    [:header.main-bar
      (if (:is-default project)
        [:h1.dashboard-title (t locale "dashboard.header.draft")]
        [:*
+        [:div.main-bar-icon {:on-click on-menu-click} i/actions]
+        [:& context-menu {:on-close on-menu-close
+                          :show (:menu-open @local)
+                          :options [[(t locale "dashboard.grid.edit") on-edit]
+                                    [(t locale "dashboard.grid.delete") on-delete]]}]
         (if (:edition @local)
           [:input.element-name {:type "text"
                                 :auto-focus true
                                 :on-key-down on-key-down
                                 :on-blur on-blur
                                 :default-value (:name project)}]
-          [:h1.dashboard-title
-           [:div.main-bar-icon
-            {:on-click on-menu-click}
-            i/actions]
-           [:& context-menu {:on-close on-menu-close
-                             :show (:menu-open @local)
-                             :options [[(t locale "dashboard.grid.edit") on-edit]
-                                       [(t locale "dashboard.grid.delete") on-delete]]}]
-           (t locale "dashboard.header.project" (:name project))])])
+          [:h1.dashboard-title (t locale "dashboard.header.project" (:name project))])])
      [:a.btn-dashboard {:on-click #(do
                                      (dom/prevent-default %)
                                      (st/emit! (dsh/create-file project-id)))}