diff --git a/app/contexts/projects/create_context.rb b/app/contexts/projects/create_context.rb
index fe8dde8c..da666a71 100644
--- a/app/contexts/projects/create_context.rb
+++ b/app/contexts/projects/create_context.rb
@@ -32,6 +32,9 @@ module Projects
         @project.namespace_id = current_user.namespace_id
       end
 
+      # Disable wall by default
+      @project.wall_enabled = false
+
       @project.creator = current_user
 
       # Import project from cloneable resource
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f703cf6b..b4fb3de3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -68,10 +68,6 @@ class ProjectsController < ProjectResourceController
     end
   end
 
-  def files
-    @notes = @project.notes.where("attachment != 'NULL'").order("created_at DESC").limit(100)
-  end
-
   #
   # Wall
   #
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 62a380eb..d2be4b1a 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -80,16 +80,6 @@ module TabHelper
     end
   end
 
-  def project_wiki_tab_class
-    [:files, :wall].each do |action|
-      return "active" if current_page?(controller: "projects", action: action, id: @project)
-    end
-
-    if ['wikis', 'snippets'].include? controller.controller_name
-     "active"
-    end
-  end
-
   def branches_tab_class
     if current_page?(branches_project_repository_path(@project)) ||
       current_controller?(:protected_branches) ||
diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml
index dfbb6a03..3f7c4322 100644
--- a/app/views/layouts/project_resource.html.haml
+++ b/app/views/layouts/project_resource.html.haml
@@ -35,11 +35,17 @@
               Merge Requests
               %span.count.merge_counter= @project.merge_requests.opened.count
 
-        = nav_link(html_options: {class: "#{project_wiki_tab_class}"}) do
-          = link_to 'Wiki', project_wiki_path(@project, :home)
+        - if @project.wiki_enabled
+          = nav_link(controller: :wikis) do
+            = link_to 'Wiki', project_wiki_path(@project, :home)
+
+        - if @project.wall_enabled
+          = nav_link(path: 'projects#wall') do
+            = link_to 'Wall', wall_project_path(@project)
 
         - if can? current_user, :admin_project, @project
           = nav_link(html_options: {class: "#{project_tab_class}"}) do
             = link_to edit_project_path(@project), class: "stat-tab tab " do
               Settings
+
       .content= yield
diff --git a/app/views/projects/files.html.haml b/app/views/projects/files.html.haml
deleted file mode 100644
index 3402e067..00000000
--- a/app/views/projects/files.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-= render 'wikis/nav'
-- unless @notes.empty?
-  %table
-    %thead
-      %tr
-        %th File name
-        %th
-
-    - @notes.each do |note|
-      %tr
-        %td
-          = link_to note.attachment.secure_url, target: "_blank" do
-            = image_tag gravatar_icon(note.author_email), class: "avatar s24"
-            = note.attachment_identifier
-        %td
-          Added
-          = time_ago_in_words(note.created_at)
-          ago
-- else
-  %p.slead All files attached to project wall, issues etc will be displayed here
-
-
diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml
index 1c2d907f..82b565de 100644
--- a/app/views/projects/wall.html.haml
+++ b/app/views/projects/wall.html.haml
@@ -1,3 +1,2 @@
-= render 'wikis/nav'
 %div.wall_page
   = render "notes/reversed_notes_with_form"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 5dd00be8..bacf23d8 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,4 +1,3 @@
-= render 'wikis/nav'
 %h3.page_title
   Snippets
   %small share code pastes with others out of git repository
diff --git a/app/views/wikis/_main_links.html.haml b/app/views/wikis/_main_links.html.haml
index 262ed746..cb8ccf81 100644
--- a/app/views/wikis/_main_links.html.haml
+++ b/app/views/wikis/_main_links.html.haml
@@ -1,16 +1,8 @@
 %span.pull-right
-  = link_to project_wiki_path(@project, :home), class: "btn btn-small grouped" do
-    Home
-  = link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
-    Pages
   - if (@wiki && @wiki.persisted?)
     = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
-      History
-  - if can?(current_user, :write_wiki, @project)
-    - if @wiki && @wiki.persisted?
+      Page History
+    - if can?(current_user, :write_wiki, @project)
       = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
         %i.icon-edit
         Edit
-    = link_to git_access_project_wikis_path(@project), class: "btn btn-small grouped" do
-      %i.icon-download-alt
-      Git Access
diff --git a/app/views/wikis/_nav.html.haml b/app/views/wikis/_nav.html.haml
index f4b0b190..6a922e16 100644
--- a/app/views/wikis/_nav.html.haml
+++ b/app/views/wikis/_nav.html.haml
@@ -1,14 +1,11 @@
 %ul.nav.nav-tabs
-  - if @project.wiki_enabled
-    = nav_link(controller: 'wikis') do
-      = link_to 'Wiki', project_wiki_path(@project, :home)
+  = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
+    = link_to 'Home', project_wiki_path(@project, :home)
 
-  - if @project.wall_enabled
-    = nav_link(path: 'projects#wall') do
-      = link_to 'Wall', wall_project_path(@project)
+  = nav_link(path: 'wikis#pages') do
+    = link_to 'Pages', pages_project_wikis_path(@project)
 
-  = nav_link(path: 'projects#files') do
-    = link_to 'Attachments', files_project_path(@project), class: "files-tab tab"
-
-  = nav_link(controller: :snippets) do
-    = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
+  = nav_link(path: 'wikis#git_access') do
+    = link_to git_access_project_wikis_path(@project) do
+      %i.icon-download-alt
+      Git Access
diff --git a/app/views/wikis/edit.html.haml b/app/views/wikis/edit.html.haml
index dd200a35..7441ceff 100644
--- a/app/views/wikis/edit.html.haml
+++ b/app/views/wikis/edit.html.haml
@@ -1,3 +1,4 @@
+= render 'wikis/nav'
 %h3.page_title
   Editing page
   = render partial: 'main_links'
diff --git a/app/views/wikis/git_access.html.haml b/app/views/wikis/git_access.html.haml
index 353d86f2..58c8aa06 100644
--- a/app/views/wikis/git_access.html.haml
+++ b/app/views/wikis/git_access.html.haml
@@ -1,3 +1,4 @@
+= render 'wikis/nav'
 %h3.page_title
   Git Access
   %strong= @gollum_wiki.path_with_namespace
diff --git a/app/views/wikis/history.html.haml b/app/views/wikis/history.html.haml
index 60920710..599e9cf6 100644
--- a/app/views/wikis/history.html.haml
+++ b/app/views/wikis/history.html.haml
@@ -1,5 +1,6 @@
+= render 'wikis/nav'
 %h3.page_title
-  %span.cgray History for
+  %span.light History for
   = @wiki.title.titleize
   = render partial: 'main_links'
 %br