diff --git a/Documentation/Doxygen/DeveloperManual/Application/BlueBerry/BlueBerryIntro.dox b/Documentation/Doxygen/DeveloperManual/Application/BlueBerry/BlueBerryIntro.dox
index a7045f61e1..06e657920c 100644
--- a/Documentation/Doxygen/DeveloperManual/Application/BlueBerry/BlueBerryIntro.dox
+++ b/Documentation/Doxygen/DeveloperManual/Application/BlueBerry/BlueBerryIntro.dox
@@ -1,73 +1,79 @@
 /**
 
 \page BlueBerryIntro BlueBerry Application Framework
 
 BlueBerry is an application framework used in MITK for creating modular and extensible end-user applications.
 
 More high-level documentation can be found below:
 
 - \subpage BlueBerryWorkbench
+- \ref BlueBerryExamples
 
-Please see the \ref BlueBerryExamples for code examples demonstrating different features of the appication framework.
+Please see the \ref BlueBerryExamples for code examples demonstrating different features of the application framework.
+
+The BlueBerry developer reference is available here:
+
+- \ref BlueBerryPlugins
+- \subpage BlueBerryExtPointsIndex
 
 
 \page BlueBerryWorkbench The Workbench: What are Views, Editors, Perspectives?
 
 BlueBerry makes use of the Eclipse UI guidlines which state some concepts on how to build up a GUI. The different objects of the platform UI shall be described here:
 
 \section Workbench Workbench
 \li root object of the platform UI
 \li collection of \ref WorkbenchWindow "windows"
 \image html workbench.jpg "The Workbech"
 
 \section WorkbenchWindow WorkbenchWindow
 \li has one \ref Workbench-Page "page"
 \image html workbench-window.jpg "Worbench Windows"
 
 \section WorkbenchPage Workbench Page
 \li denotes to the inner part of the \ref WorkbenchWindow "window", that is: everything except the title bar
 \li may have one menu bar, one toolbar, one shortcut bar, and one statusbar
 \li has one or more \ref Perspective "perspectives"
 \image html workbench-page.jpg "Workbench Page"
 
 \section Perspective Perspective
 <UL>
 <LI> A visual container for a set of \ref Views "views" and content \ref Editors "editors" </LI>
 <LI> Shows \ref Views "views" and \ref Editors "editors" in a certain layout </LI>
 <LI> Like a page within a book: </LI>
     <UL>
     <LI> Only one perspective is visible at any time </LI>
     <LI> There are several perspectives inside a \ref Workbench-Page "page" </LI>
     </UL>
 </UL>
 \image html workbench-window-perspective.png "A Perspective"
 
 \section Part Part
 \li every \ref Views "View" or \ref Editors "Editor" is called \b Part
 
 \subsection Editors Editors
 \li the StdMultiWidget is an example for an editor in our MainApp
 \li Contains the primary content, such as a document or image data, which users interact with
 \li content is the primary focus of attention and a reflection of the primary task
 \li primary position in the UI
 \li contributes commands to the workbench's main menu bar and toolbar
 \li shared in other perspectives
 \image html workbench-window-editor-area.png "Editor Area"
 
 \subsection Views Views
 <UL>
 <LI> support the primary task </LI>
     <UL>
     <LI> navigate a hierarchy of information </LI>
     <LI> open an \ref Editors "editor" </LI>
     <LI> view/edit properties </LI>
     </UL>
 <LI> The views exist wholly within the perspective (not shared, one instance at a time) </LI>
 <LI> Every functionality is a view- it supports medical image processing </LI>
 </UL>
 \image html workbench-window-views.png "Views"
 
 \section ClassDiagram Summary as class diagram
 \image html workbench-class-diagram.jpg "class diagram"
 
 */
diff --git a/Documentation/Doxygen/DeveloperManual/Application/DevelopmentApplication.dox b/Documentation/Doxygen/DeveloperManual/Application/DevelopmentApplication.dox
index 1bcb321658..4e00e090fc 100644
--- a/Documentation/Doxygen/DeveloperManual/Application/DevelopmentApplication.dox
+++ b/Documentation/Doxygen/DeveloperManual/Application/DevelopmentApplication.dox
@@ -1,16 +1,17 @@
 /**
 
 \page DevelopmentApplication Developing with the MITK Application Framework
 
 MITK offers a powerful application featuring a plugin system and many predefined plugins. You can configure this application to offer a set of functionality to the user and easily create an installer. 
 Working with the application, you will have to learn about extension points and the Blueberry framework itself. If you are new to the matter, please also consult \ref Architecture and \ref FirstSteps.
 
 <ul>  
   <li> \subpage BlueBerryIntro </li>
   <li> \subpage BlueBerryExamples </li>
-  <li> \subpage mitkExtPointsIndex </li>
-  <li> \subpage DeploymentPage </li>
 </ul>
 
+The MITK application extension-point reference is available here:
+
+ - \subpage mitkExtPointsIndex
 
 */
diff --git a/Documentation/Doxygen/DeveloperManual/DeveloperManualPortal.dox b/Documentation/Doxygen/DeveloperManual/DeveloperManualPortal.dox
index ec44916cba..aa9276cf30 100644
--- a/Documentation/Doxygen/DeveloperManual/DeveloperManualPortal.dox
+++ b/Documentation/Doxygen/DeveloperManual/DeveloperManualPortal.dox
@@ -1,33 +1,31 @@
 /**
 \page DeveloperManualPortal MITK: Developer Manual
 
 Development with MITK can happen under several disctinct conditions. Depending on whether you are using the Toolkit or the entire application, different sections may apply to you. In case you are unsure about what you need, please refer to \link Architecture The Architecture of MITK text\endlink. An extensive Introduction to MITK is available under \link StartingDevelopment Starting your MITK Development\endlink.
 
 Depending on whether you are working with the \link DevelopmentToolkit Toolkit\endlink or the \link DevelopmentApplication Application\endlink, you can refer to their respective pages. Generated API-Documentation can be found \link DevelopmentAPI here\endlink.
 
 \section DeveloperManualStarting Starting your MITK Development
 
 <ul>
   <li> \subpage StartingDevelopment </li>
   <ul>
     <li> \ref Architecture </li>
     <li> \ref SettingUpMITK </li>
     <li> \ref GettingToKnowMITK </li>
-	  <li> \ref FirstSteps </li>
-	  <li> \ref AboutTestingPage </li>
+    <li> \ref FirstSteps </li>
+    <li> \ref AboutTestingPage </li>
   </ul>
   <li> \subpage DevelopmentToolkit </li>
   <ul>
   <li> \ref Concepts </li>
   <li> \ref MITKModuleManualsListPage </li>
   </ul>
   <li> \subpage DevelopmentApplication </li>
   <ul>
     <li> \ref mitkExtPointsIndex </li>
-    <li> \ref DeploymentPage </li>
-    <li> \ref BlueBerryExamples </li>
-    <li> \ref BlueBerryIntro </li>
   </ul>
+  <li> \subpage DeploymentPage </li>
 </ul>
 
 */
diff --git a/Documentation/MITKDoxygenLayout.xml b/Documentation/MITKDoxygenLayout.xml
index cdfdf03ebc..96f50c0087 100644
--- a/Documentation/MITKDoxygenLayout.xml
+++ b/Documentation/MITKDoxygenLayout.xml
@@ -1,196 +1,197 @@
 <doxygenlayout version="1.0">
   <!-- Navigation index tabs for HTML output -->
   <navindex>
     <tab type="mainpage" visible="yes" title="Portal"/>
     <tab type="pages" visible="yes" title="" intro=""/>
     <tab type="usergroup" title="MITK API Documentation">
       <tab type="modules" visible="yes" title="Groups" intro="Here is a list of all groups:"/>
       <tab type="namespaces" visible="yes" title="">
         <tab type="namespacelist" visible="yes" title="" intro=""/>
         <tab type="namespacemembers" visible="yes" title="" intro=""/>
       </tab>
       <tab type="classes" visible="yes" title="">
         <tab type="classlist" visible="yes" title="" intro=""/>
         <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
         <tab type="hierarchy" visible="yes" title="" intro=""/>
         <tab type="classmembers" visible="yes" title="" intro=""/>
       </tab>
       <tab type="files" visible="yes" title="">
         <tab type="filelist" visible="yes" title="" intro=""/>
         <tab type="globals" visible="yes" title="" intro=""/>
       </tab>
       <tab type="dirs" visible="yes" title="" intro=""/>
       <tab type="examples" visible="yes" title="" intro=""/>
       <tab type="usergroup" title="Deprecated">
         <tab type="user" url="@ref deprecated" title="Deprecated List"/>
         <tab type="user" url="@ref deprecatedSince2013_03" title="Deprecated as of MITK 2013.03"/>
         <tab type="user" url="@ref deprecatedSince2012_12" title="Deprecated as of MITK 2012.12"/>
         <tab type="user" url="@ref deprecatedSince2012_09" title="Deprecated as of MITK 2012.09"/>
       </tab>
     </tab>
+    <tab type="user" url="@ref BlueBerryIntro" title="BlueBerry Application Framework"/>
   </navindex>
 
   <!-- Layout definition for a class page -->
   <class>
     <briefdescription visible="yes"/>
     <includes visible="$SHOW_INCLUDE_FILES"/>
     <inheritancegraph visible="$CLASS_GRAPH"/>
     <collaborationgraph visible="$COLLABORATION_GRAPH"/>
     <allmemberslink visible="yes"/>
     <memberdecl>
       <nestedclasses visible="yes" title=""/>
       <publictypes title=""/>
       <publicslots title=""/>
       <signals title=""/>
       <publicmethods title=""/>
       <publicstaticmethods title=""/>
       <publicattributes title=""/>
       <publicstaticattributes title=""/>
       <protectedtypes title=""/>
       <protectedslots title=""/>
       <protectedmethods title=""/>
       <protectedstaticmethods title=""/>
       <protectedattributes title=""/>
       <protectedstaticattributes title=""/>
       <packagetypes title=""/>
       <packagemethods title=""/>
       <packagestaticmethods title=""/>
       <packageattributes title=""/>
       <packagestaticattributes title=""/>
       <properties title=""/>
       <events title=""/>
       <privatetypes title=""/>
       <privateslots title=""/>
       <privatemethods title=""/>
       <privatestaticmethods title=""/>
       <privateattributes title=""/>
       <privatestaticattributes title=""/>
       <friends title=""/>
       <related title="" subtitle=""/>
       <membergroups visible="yes"/>
     </memberdecl>
     <detaileddescription title=""/>
     <memberdef>
       <inlineclasses title=""/>
       <typedefs title=""/>
       <enums title=""/>
       <constructors title=""/>
       <functions title=""/>
       <related title=""/>
       <variables title=""/>
       <properties title=""/>
       <events title=""/>
     </memberdef>
     <usedfiles visible="$SHOW_USED_FILES"/>
     <authorsection visible="yes"/>
   </class>
 
   <!-- Layout definition for a namespace page -->
   <namespace>
     <briefdescription visible="yes"/>
     <memberdecl>
       <nestednamespaces visible="yes" title=""/>
       <classes visible="yes" title=""/>
       <typedefs title=""/>
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
       <membergroups visible="yes"/>
     </memberdecl>
     <detaileddescription title=""/>
     <memberdef>
       <inlineclasses title=""/>
       <typedefs title=""/>
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
     </memberdef>
     <authorsection visible="yes"/>
   </namespace>
 
   <!-- Layout definition for a file page -->
   <file>
     <briefdescription visible="yes"/>
     <includes visible="$SHOW_INCLUDE_FILES"/>
     <includegraph visible="$INCLUDE_GRAPH"/>
     <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
     <sourcelink visible="yes"/>
     <memberdecl>
       <classes visible="yes" title=""/>
       <namespaces visible="yes" title=""/>
       <defines title=""/>
       <typedefs title=""/>
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
       <membergroups visible="yes"/>
     </memberdecl>
     <detaileddescription title=""/>
     <memberdef>
       <inlineclasses title=""/>
       <defines title=""/>
       <typedefs title=""/>
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
     </memberdef>
     <authorsection/>
   </file>
 
   <!-- Layout definition for a group page -->
   <group>
     <briefdescription visible="yes"/>
     <groupgraph visible="$GROUP_GRAPHS"/>
     <memberdecl>
       <nestedgroups visible="yes" title=""/>
       <dirs visible="yes" title=""/>
       <files visible="yes" title=""/>
       <namespaces visible="yes" title=""/>
       <classes visible="yes" title=""/>
       <defines title=""/>
       <typedefs title=""/>
       <enums title=""/>
       <enumvalues title=""/>
       <functions title=""/>
       <variables title=""/>
       <signals title=""/>
       <publicslots title=""/>
       <protectedslots title=""/>
       <privateslots title=""/>
       <events title=""/>
       <properties title=""/>
       <friends title=""/>
       <membergroups visible="yes"/>
     </memberdecl>
     <detaileddescription title=""/>
     <memberdef>
       <pagedocs/>
       <inlineclasses title=""/>
       <defines title=""/>
       <typedefs title=""/>
       <enums title=""/>
       <enumvalues title=""/>
       <functions title=""/>
       <variables title=""/>
       <signals title=""/>
       <publicslots title=""/>
       <protectedslots title=""/>
       <privateslots title=""/>
       <events title=""/>
       <properties title=""/>
       <friends title=""/>
     </memberdef>
     <authorsection visible="yes"/>
   </group>
 
   <!-- Layout definition for a directory page -->
   <directory>
     <briefdescription visible="yes"/>
     <directorygraph visible="yes"/>
     <memberdecl>
       <dirs visible="yes"/>
       <files visible="yes"/>
     </memberdecl>
     <detaileddescription title=""/>
   </directory>
 </doxygenlayout>