diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml
index d023846c5eb73717304ca765e3f71398f7a3b515..dcc7962830df0766f5f1ac96b9b43516e81c27e4 100644
--- a/app/views/layouts/explore.html.haml
+++ b/app/views/layouts/explore.html.haml
@@ -2,7 +2,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: page_title
-  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     - if current_user
       = render "layouts/head_panel", title: page_title
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 686280c9ec73695db481aad37bcae2827cff299e..78d6b768155ddeb0fc431b7553b18ab2ceedef7f 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -3,10 +3,11 @@
     = link_to group_path(@group), title: "Home" do
       %i.fa.fa-dashboard
       Activity
-  = nav_link(controller: [:group, :milestones]) do
-    = link_to group_milestones_path(@group) do
-      %i.fa.fa-clock-o
-      Milestones
+  - if current_user
+    = nav_link(controller: [:group, :milestones]) do
+      = link_to group_milestones_path(@group) do
+        %i.fa.fa-clock-o
+        Milestones
   = nav_link(path: 'groups#issues') do
     = link_to issues_group_path(@group) do
       %i.fa.fa-exclamation-circle
diff --git a/app/views/layouts/public_group.html.haml b/app/views/layouts/public_group.html.haml
index a289b784725315f6e3423396864e3cdde4d55201..99c29dc78dc43636065f16218f63c4fddebab1a6 100644
--- a/app/views/layouts/public_group.html.haml
+++ b/app/views/layouts/public_group.html.haml
@@ -1,10 +1,16 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: group_head_title
-  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: "group: #{@group.name}"
-    %nav.main-nav.navbar-collapse.collapse
-      .container= render 'layouts/nav/group'
-    .container
-      .content= yield
+    .page-with-sidebar
+      .sidebar-wrapper
+        = render 'layouts/nav/group'
+      .content-wrapper
+        .container-fluid
+          .content
+            = render "layouts/flash"
+            .clearfix
+              = yield
+    = yield :embedded_scripts
diff --git a/app/views/layouts/public_projects.html.haml b/app/views/layouts/public_projects.html.haml
index 2a9230244f89a38391ccfa4a205f1ff07135f23c..343bddcf0b2ea6ff7b6e13ef0aa685cde78dd249 100644
--- a/app/views/layouts/public_projects.html.haml
+++ b/app/views/layouts/public_projects.html.haml
@@ -1,10 +1,15 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: @project.name_with_namespace
-  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: project_title(@project)
-    %nav.main-nav.navbar-collapse.collapse
-      .container= render 'layouts/nav/project'
-    .container
-      .content= yield
+    .page-with-sidebar
+      .sidebar-wrapper
+        = render 'layouts/nav/project'
+      .content-wrapper
+        .container-fluid
+          .content
+            = render "layouts/flash"
+            = yield
+    = yield :embedded_scripts
diff --git a/app/views/layouts/public_users.html.haml b/app/views/layouts/public_users.html.haml
index 4aa258fea0d8d5aa83d65d401a287da3581ced3b..18b856b10e1ebe3448ff1c639be32a1028b09509 100644
--- a/app/views/layouts/public_users.html.haml
+++ b/app/views/layouts/public_users.html.haml
@@ -1,7 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: @title
-  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: @title
     .container.navless-container