diff --git a/akka-docs/dev/developer-guidelines.rst b/akka-docs/dev/developer-guidelines.rst
index ab19c370a2..138ff18476 100644
--- a/akka-docs/dev/developer-guidelines.rst
+++ b/akka-docs/dev/developer-guidelines.rst
@@ -1,3 +1,5 @@
+.. _developer_guidelines:
+
 Developer Guidelines
 ====================
 
diff --git a/akka-docs/dev/documentation.rst b/akka-docs/dev/documentation.rst
index b0da0bd698..aa44d15291 100644
--- a/akka-docs/dev/documentation.rst
+++ b/akka-docs/dev/documentation.rst
@@ -3,9 +3,9 @@
 
 .. _documentation:
 
-###############
- Documentation
-###############
+#########################
+ Documentation Guidelines
+#########################
 
 .. sidebar:: Contents
 
diff --git a/akka-docs/dev/sponsors.rst b/akka-docs/dev/sponsors.rst
index 127ab17ee1..085d35cc0d 100644
--- a/akka-docs/dev/sponsors.rst
+++ b/akka-docs/dev/sponsors.rst
@@ -1,8 +1,10 @@
+.. _sponsors:
+
 Sponsors
 ============
 
 YourKit
-=======
+-------
 
 YourKit is kindly supporting open source projects with its full-featured Java Profiler.
 YourKit, LLC is the creator of innovative and intelligent tools for profiling Java and .NET applications.
diff --git a/akka-docs/dev/team.rst b/akka-docs/dev/team.rst
index 4038fa9347..53991eb260 100644
--- a/akka-docs/dev/team.rst
+++ b/akka-docs/dev/team.rst
@@ -1,9 +1,11 @@
+.. _team:
+
 Team
 =====
 
-===================  ==========================  =================================
+===================  ==========================  ====================================
 Name                 Role                        Email
-===================  ==========================  =================================
+===================  ==========================  ====================================
 Jonas Bonér          Founder, Despot, Committer  jonas AT jonasboner DOT com
 Viktor Klang         Bad cop, Committer          viktor DOT klang AT gmail DOT com  
 Debasish Ghosh       Committer                   dghosh AT acm DOT org  
@@ -21,5 +23,6 @@ Irmo Manie           Committer
 Heiko Seeberger      Committer    
 Hiram Chirino        Committer    
 Scott Clasen         Committer    
-Roland Kuhn          Committer    
-===================  ==========================  =================================
\ No newline at end of file
+Roland Kuhn          Committer
+Patrik Nordwall      Committer                   patrik DOT nordwall AT gmail DOT com
+===================  ==========================  ====================================
\ No newline at end of file
diff --git a/akka-docs/general/issue-tracking.rst b/akka-docs/general/issue-tracking.rst
index a57e2f9c99..7c9afd9ade 100644
--- a/akka-docs/general/issue-tracking.rst
+++ b/akka-docs/general/issue-tracking.rst
@@ -1,3 +1,5 @@
+.. _issue_tracking:
+
 Issue Tracking
 ==============
 
diff --git a/akka-docs/general/licenses.rst b/akka-docs/general/licenses.rst
index 02a3a10cec..b7104d9679 100644
--- a/akka-docs/general/licenses.rst
+++ b/akka-docs/general/licenses.rst
@@ -1,3 +1,5 @@
+.. _licenses:
+
 Licenses
 ========
 
diff --git a/akka-docs/general/migration-guides.rst b/akka-docs/general/migration-guides.rst
index 31e0593f71..bf43d939d5 100644
--- a/akka-docs/general/migration-guides.rst
+++ b/akka-docs/general/migration-guides.rst
@@ -1,3 +1,5 @@
+.. _migration:
+
 Migration Guides
 ================
 
diff --git a/akka-docs/index.rst b/akka-docs/index.rst
index 692664ce81..39245a1bfb 100644
--- a/akka-docs/index.rst
+++ b/akka-docs/index.rst
@@ -11,7 +11,31 @@ Contents
    java/index
    dev/index
 
-Links
-=====
+Project Info
+============
+
+* :ref:`migration`
 
 * `Support <http://scalablesolutions.se>`_
+
+* `Downloads <http://akka.io/downloads/>`_
+
+* `Source Code <http://github.com/jboner/akka>`_
+
+* `API <http://akka.io/api/akka/snapshot/>`_
+
+* `Maven Repository <http://akka.io/repository/>`_
+
+* `Mailing List <http://groups.google.com/group/akka-user>`_
+
+* :ref:`licenses`
+
+* :ref:`issue_tracking`
+
+* :ref:`team`
+
+* :ref:`developer_guidelines`
+
+* :ref:`documentation`
+
+* :ref:`sponsors`
\ No newline at end of file