diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index cadf6c9d..28791b32 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -12,40 +12,67 @@
 %br
 
 .row
-  .span6
+  .span4
     .ui-box
       .title
-        %h5 Help
+        %h5 Quick help
       %ul.well-list
         %li
-          %span= link_to "Workflow", help_workflow_path
-
+          Email your
+          = mail_to Gitlab.config.gitlab.support_email, "support contact"
         %li
-          %span= link_to "Permissions", help_permissions_path
-
+          Use the
+          = link_to "search bar", '#', onclick: "$("#search").focus();"
+          on the top of this page
         %li
-          %span= link_to "Web Hooks", help_web_hooks_path
-
+          Ask in our
+          = link_to "support forum", "https://groups.google.com/forum/#!forum/gitlabhq"
         %li
-          %span= link_to "API", help_api_path
-
-        %li
-          %span= link_to "GitLab Markdown", help_markdown_path
-
-        %li
-          %span= link_to "SSH keys", help_ssh_path
-
-  .span6
+          Browse our
+          = link_to "issue tracker", "https://github.com/gitlabhq/gitlabhq/issues"
+  .span4
     .ui-box
       .title
-        %h5 Admin Guide
+        %h5 User documentation
+      %ul.well-list
+        %li
+          %strong= link_to "Workflow", help_workflow_path
+          %p Learn how to use Git and GitLab together.
+
+        %li
+          %strong= link_to "SSH keys", help_ssh_path
+          %p Setup secure access to your projects.
+
+        %li
+          %strong= link_to "GitLab Markdown", help_markdown_path
+          %p Learn what you can do with GitLab's advanced formatting system.
+
+        %li
+          %strong= link_to "Permissions", help_permissions_path
+          %p Get familiar with GitLab's permission levels.
+
+        %li
+          %strong= link_to "API", help_api_path
+          %p Explore how you can access GitLab via a simple and powerful API.
+
+        %li
+          %strong= link_to "Web Hooks", help_web_hooks_path
+          %p Let GitLab notify you when new code has been pushed to your project.
+
+  .span4
+    .ui-box
+      .title
+        %h5 Admin documentation
       %ul.well-list
 
         %li
-          %span= link_to "GitLab Rake Tasks", help_raketasks_path
+          %strong= link_to "Rake Tasks", help_raketasks_path
+          %p Explore what GitLab has in store for you to make administration easier.
 
         %li
-          %span= link_to "System Hooks", help_system_hooks_path
+          %strong= link_to "System Hooks", help_system_hooks_path
+          %p Let GitLab notify you when certain management tasks need to be carried out.
 
         %li
-          %span= link_to "Public Area", help_public_area_path
+          %strong= link_to "Public Access", help_public_access_path
+          %p Learn how you can allow public access to a project.