diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js
index f5bbf10fc7..15b7a74367 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js
@@ -1,323 +1,324 @@
 // If you want to create a new button you have to add some data (strings) to the following five arrays.
 // Make sure that you add your data at the same position in each array.
 // The buttons will be generated in order to the array's index. e.g. data at array's index '0' will generate the first button.
 
 // enter the name of your module here
 var moduleNames = new Array("Dicom Import",
-                            "IVIM",
-                            "Preprocessing",
-                            "Quantification",
+                            "Preprocessing and Reconstruction",
+//                            "Quantification",
                             "Tractography",
                             "Connectomics",
-                            "Synthetic Data",
-                            "Registration",
+                            "Fiberfox",
+//                            "Registration",
+                            "IVIM",
                             "Image Processing",
                             "Visualization",
                             "Utilities",
                             "MITK Downloads & News");
 
 // add the MITK-link to your module
 var moduleLinks = new Array("mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
-                            "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
-                            "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
+//                            "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
+//                            "mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=false",
                             "http://www.mitk.org");
 
 // add the filename of your icon for the module. Place the picture in subdirectory "pics".
 // The picture's width should be 136 pixel; the height 123 pixel.
 var picFilenames = new Array("01dicomimport.png",
-                             "07ivim.png",
                              "02preprocessingreconstruction.png",
-                             "03quantification.png",
+//                             "03quantification.png",
                              "04tractography.png",
                              "06connectomics.png",
                              "10softwarephantoms.png",
-                             "12registration.png",
+//                             "12registration.png",
+                             "07ivim.png",
                              "11segmentation.png",
                              "08volumevisualization.png",
                              "13utilities.png",
                              "button_mitk.png");
 
 // if you want to create an animated icon, add the name of your animated gif (placed in subdirectory "pics"). Otherwise enter an empty string "".
 // The animation's width should be 136 pixel; the height 123 pixel.
 var aniFilenames = new Array("01adicomimport.png",
-                             "07aivim.png",
                              "02apreprocessingreconstruction.png",
-                             "03aquantification.png",
+//                             "03aquantification.png",
                              "04atractography.png",
                              "06aconnectomics.png",
                              "10asoftwarephantoms.png",
-                             "12aregistration.png",
+//                             "12aregistration.png",
+                             "07aivim.png",
                              "11asegmentation.png",
                              "08avolumevisualization.png",
                              "13autilities.png",
                              "button_mitka.png");
 
 // if your module is not stable, you can mark it as experimental.
 // just set true for experimental or false for stable.
 var experimental = new Array(false,
                              false,
                              false,
                              false,
                              false,
                              false,
                              false,
-                             true,
-                             false,
                              false,
+//                             false,
+//                             false,
                              false,
                              false);
 
 // add the description for your module. The description is displayed in a PopUp-window.
 var moduleDescriptions = new Array("MITK Diffusion supports direct import of Siemens diffusion weighted DICOM files.",
-                                   "You can use Intravoxel Incoherent Motion to estimate tissue perfusion on basis of diffusion measurements. Several models and interactive exploration of the data are supported.",
                             "You can use MITK Diffusion to preprocess diffusion weighted MR Images using techniques like gradient averaging or reduction and baseline image extraction. Then you can estimate diffusion tensors or q-balls using different reconstruction methods and calculates scalar indices (FA, GFA, ...).",
-                            "MITK Diffusion allows partial volume analysis and the evaluation and exploration of Tract Based Spatial Statistic datasets (it does NOT reimplement the TBSS methods available in FSL). The Partial Volume Analysis view provides a very robust method for semi-automatic ROI analysis. It uses EM clustering to probabilistically segment fiber vs. non-fiber vs. partial volume.",
-                            "The tractography components of MITK Diffusion implement several fiber tractography algorithms (global, probabilistic and streamline). The fiber bundle operations view allows for extraction, join, and substraction of bundles. It also generates a variety of images from given fiber tracts and gives detailed information about the fiberbundle itself.",
-                            "Connectomics aims at building graphs (nodes and edges) from a global tractogram and applying graph theory for data analysis.",
-                            "The Fiberfox software phantom tool allows you to create synthetic phantoms easily and with a wide variety of properties and options.",
-                            "Registration views allow for rigid and point based image registration (only non-diffusion!).",
+//                            "MITK Diffusion allows partial volume analysis and the evaluation and exploration of Tract Based Spatial Statistic datasets (it does NOT reimplement the TBSS methods available in FSL). The Partial Volume Analysis view provides a very robust method for semi-automatic ROI analysis. It uses EM clustering to probabilistically segment fiber vs. non-fiber vs. partial volume.",
+                            "The tractography components of MITK Diffusion implement several fiber tractography algorithms (global and streamline; tensor, dODF/fODF/FOD, peak based as well as machine learning based using the raw signal). The fiber bundle operations view enables fiber postprocessing in various ways. The fiber quantification view generates a variety of images from given fiber tracts, extracts the principal fiber directions and gives detailed information about the fiberbundle itself.",
+                            "Connectomics aims at building graphs (nodes and edges) from a tractogram and applying graph theory for data analysis.",
+                            "The Fiberfox software phantom tool allows you to create synthetic diffusion-weighted MR images easily and with a wide variety of properties and options.",
+//                            "Registration views allow for rigid and point based image registration (only non-diffusion!).",
+                            "You can use Intravoxel Incoherent Motion to estimate tissue perfusion on basis of diffusion measurements. Several models and interactive exploration of the data are supported.",
                             "MITK Diffusion provides tools for image segmentation and diffusion unrelated image processing.",
                             "In order to visually present your research MITK Diffusion contains fast volume rendering of images, means to capture high resolution screenshots as well as movies of the 3D sceen.",
                             "Further utilites include the property list view to modify the properties of the selected data node as well as a logging view for debugging purposes.",
                             "Open the MITK website in an external browser.");
 
 var bttns = new Array();
 
 var d = document, da = d.all;
 
 // holds id of current mouseover-HTML-element
 var currentTarget;
 
 // get the id of current mouseover-HTML-element
 d.onmouseover = function(o){
   var e = da ? event.srcElement : o.target;
   currentTarget = e.id;
 }
 
 
 // build-function called by onload-event in HTML-document
 function createButtons(){
 
   for (i=0; i < moduleNames.length; i++){
     bttns[i] = new Button(moduleNames[i],moduleLinks[i], picFilenames[i], aniFilenames[i],moduleDescriptions[i]);
     bttns[i].createButton();
   }
 
   for (i=0; i < moduleNames.length; i++){
 
     if(experimental[i]){
       setExperimental(i);
     }
   }
 
   createClearFloat();
 }
 
 // Class Button
 function Button(moduleName, moduleLink, picFilename, aniFilename, moduleDescr){
 
   // Properties
   this.bttnID = "bttn" + moduleName;
   this.modName = moduleName;
   this.modLink = moduleLink;
   this.picPath = "pics/" + picFilename;
   this.aniPath = "pics/" + aniFilename;
   this.modDescr = moduleDescr;
 
   // Methods
   this.createButton = function(){
 
     // get DIV-wrapper for Button and append it to HTML-document
     bttnWrapper = this.createWrapper();
     document.getElementById("bttnField").appendChild(bttnWrapper);
 
     // get link-element for picture and append it to DIV-wrapper
     bttnPicLink = this.createPicLink();
     bttnWrapper.appendChild(bttnPicLink);
 
     // set HTML attributes for button-element
     bttn = document.createElement("img");
     bttn.src = this.picPath;
     bttn.id = this.bttnID;
     bttn.className = "modBttn";
     bttn.height = 123;
     bttn.width = 136;
     bttn.onmouseover = function(){startAni(this.id);};
     bttn.onmouseout = function(){stopAni(this.id);};
 
     // append button to link-element
     bttnPicLink.appendChild(bttn);
 
-    // create text-link and add it to DIV-wrapper
-    bttnTxtLink = document.createElement("a");
-    bttnTxtLink.href = this.modLink;
-    bttnTxtLink.className = "txtLink";
-    bttnTxtLink.appendChild(document.createTextNode(this.modName));
-    bttnWrapper.appendChild(bttnTxtLink);
+//    // create text-link and add it to DIV-wrapper
+//    bttnTxtLink = document.createElement("a");
+////    bttnTxtLink.href = this.modLink;
+//    bttnTxtLink.className = "txtLink";
+//    bttnTxtLink.appendChild(document.createTextNode(this.modName));
+//    bttnTxtLink.onclick = function(){showPopUpWindow();};
+//    bttnTxtLink.id = "popup" + this.modName;
+//    bttnWrapper.appendChild(bttnTxtLink);
 
     // create pop-up link for module description
     bttnPopUpLink = document.createElement("a");
     modName = this.modName;
     modDescr = this.modDescr;
     bttnPopUpLink.onclick = function(){showPopUpWindow();};
     bttnPopUpLink.className = "popUpLink";
     bttnPopUpLink.id = "popup" + this.modName;
-    bttnPopUpLink.appendChild(document.createTextNode("more info >>"));
-    bttnWrapper.appendChild(document.createElement("br"));
+    bttnPopUpLink.appendChild(document.createTextNode(this.modName));
     bttnWrapper.appendChild(bttnPopUpLink);
 
     return bttn;
   }
 
   this.createWrapper = function(){
     bttnWrapper = document.createElement("div");
     bttnWrapper.id = "wrapper" + this.modName;
     bttnWrapper.className = "bttnWrap";
 
     return bttnWrapper;
   }
 
   this.createPicLink = function(){
     picLink = document.createElement("a");
-    picLink.href = this.modLink;
+//    picLink.href = this.modLink;
     picLink.id = "link" + this.modName;
 
     return picLink;
   }
 
 }
 
 
 function showPopUpWindow(){
 
   // modules position in array?
   modulePos = getPos(currentTarget,"popup");
 
   // get reference to anchor-element in HTML-document
   popUpAnchor = document.getElementById("popupAnchor");
 
   // check if a popUp is open
   if(popUpAnchor.hasChildNodes()){
     // if a popUp is open, remove it!
     popUpAnchor.removeChild(document.getElementById("popup"));
   }
 
   // create new container for popUp
   container = document.createElement("div");
   container.id = "popup";
   container.align = "right";
 
   // append popUp-container to HTML-document
   popUpAnchor.appendChild(container);
 
   // create close-button and append it to popUp-container
   bttnClose = document.createElement("img");
   bttnClose.src = "pics/popup_bttn_close.png";
   bttnClose.id = "bttnClose";
   bttnClose.onclick = function(){closeInfoWindow();};
   container.appendChild(bttnClose);
 
   // create container for content-elements
   contHeadline = document.createElement("div");
   contHeadline.id = "contHeadline";
   contDescription = document.createElement("div");
   contDescription.id = "contDescription";
   contModLink = document.createElement("div");
   contModLink.id = "contModLink";
 
   // append content-container to popUp-container
   container.appendChild(contHeadline);
   container.appendChild(contDescription);
   container.appendChild(contModLink);
 
   // create text-elements with content
   headline = document.createTextNode(moduleNames[modulePos] + " ");
   description = document.createTextNode(moduleDescriptions[modulePos]);
   moduleLink = document.createElement("a");
   moduleLink.href = moduleLinks[modulePos] ;
   moduleLink.className = 'moduleLink';
   moduleLinkTxt = document.createTextNode("Click here to open '" + moduleNames[modulePos].toLowerCase() + "'");
   moduleLink.appendChild(moduleLinkTxt);
 
   // append text-elements to their container
   contHeadline.appendChild(headline);
   contDescription.appendChild(description);
   //contModLink.appendChild(moduleLink);
 }
 
 function getPos(id,prefix){
 
   if(prefix == "popup"){
     targetID = id.slice(5);
   }else{
     if(prefix == "bttn"){
       targetID = id.slice(4);
     }
   }
 
   for(i=0; i < moduleNames.length; i++ ){
     if(moduleNames[i] == targetID){
       return i;
     }
   }
 }
 
 function setExperimental(modPos){
   linkID = "link" + moduleNames[modPos];
 
   expPic = document.createElement("img");
   expPic.src = "pics/experimental.png";
   expPic.className = "expPic";
   //alert(bttns[modPos].bttnID);
   expPic.onmouseover = function(){startAni(bttns[modPos].bttnID);changeToHover(bttns[modPos].bttnID);};
   expPic.onmouseout = function(){stopAni(bttns[modPos].bttnID);changeToNormal(bttns[modPos].bttnID);};
 
   document.getElementById(linkID).appendChild(expPic);
 }
 
 function changeToHover(targetId){
   bttn = document.getElementById(targetId);
   bttn.className = "modBttnHover";
 }
 
 function changeToNormal(targetId){
   bttn = document.getElementById(targetId);
   bttn.className = "modBttn";
 }
 
 // function to close PopUp-window
 function closeInfoWindow(){
   popUpAnchor = document.getElementById("popupAnchor");
   popUpAnchor.removeChild(document.getElementById("popup"));
 }
 
 function createClearFloat(){
   cf = document.createElement("div");
   cf.className = "clearfloat";
   document.getElementById("bttnField").appendChild(cf);
 }
 
 startAni = function(targetId){
   modulePos = getPos(targetId,"bttn");
 
   if(aniFilenames[modulePos] != ''){
     bttn = document.getElementById(targetId);
     bttn.src = "pics/" + aniFilenames[modulePos];
   }
 }
 
 stopAni = function(targetId){
   modulePos = getPos(targetId,"bttn");
 
   bttn = document.getElementById(targetId);
   bttn.src = "pics/" + picFilenames[modulePos];
 }
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html
index db39343fd2..6ffe88284f 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html
@@ -1,40 +1,42 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MITK Diffusion Imaging App</title>
     <link rel="stylesheet" type="text/css" href="style.css">
   <script language="javascript" src="function.js"></script>
   </head>
 
   <body onload="createButtons()" oncontextmenu="return false;">
 
     <div id="screen">
 
       <!-- Welcome headline and introduction -->
       <div id="welcome">
 
-        <h1>Welcome to MITK Diffusion!</h1>
+        <h1>Welcome to MITK Diffusion (beta release)!</h1>
 
         <!-- PopUps with module description generated by js are placed in here -->
         <div id="popupAnchor"></div>
 
         <div id="welcomeText" align="justify">
-          This application includes all diffusion imaging modules that were developed at the German Cancer Research Center (DKFZ). The software is developed on the basis of the well established, free open source software toolkit MITK. It is designed to perform tasks like fiber tracking, quantification, group analysis, connectomics, synthetic data generation or other image processing tasks. For more information, please also visit our website www.mitk.org or have a look at the <a href="mitk://mitk.perspectives/org.blueberry.perspectives.help?clear=true">help perspective</a>.
+          This application includes some of the diffusion imaging modules that are being developed at the German Cancer Research Center (DKFZ). The software is developed on the basis of the well established, free open source software toolkit MITK. It is designed to perform tasks like ODF reconstruction, fiber tractography, MR image simulation, quantification and other image processing tasks. For more information, please also visit our website www.mitk.org or have a look at the <a href="mitk://mitk.perspectives/org.blueberry.perspectives.help?clear=true">help perspective</a>.
+          <br/>
+          This is a beta release with a reduced set of features based on the current master branch of MITK and has not been tested extensively! The next stable release including more features that are missing in this application will be based on the next stable release of MITK. To use the full set of features we recommend to <a href="http://docs.mitk.org/nightly/BuildInstructionsPage.html">build MITK Diffusion from source</a>.
           <br/>
           <a href="mitk://mitk.perspectives/org.mitk.perspectives.diffusiondefault?clear=true">Work with MITK Diffusion</a>
-          
+
 <br/><br/><b>Features:</b><br/><br/>
         </div>
 
       </div>
 
       <!-- area for module buttons -->
       <div id="bttnField">
         <!-- Buttons created by js-fucntion are placed in here -->
       </div>
 
     </div>
   </body>
 </html>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.cpp
index 3c2f4178f7..bd9b51f009 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.cpp
@@ -1,85 +1,85 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkDiffusionApplicationPlugin.h"
 #include "src/QmitkDiffusionImagingAppApplication.h"
 
 #include "src/internal/Perspectives/QmitkWelcomePerspective.h"
 #include "src/internal/QmitkDiffusionImagingAppIntroPart.h"
 
 #include <mitkVersion.h>
 #include <mitkLogMacros.h>
 
 #include <service/cm/ctkConfigurationAdmin.h>
 #include <service/cm/ctkConfiguration.h>
 
 #include <QFileInfo>
 #include <QDateTime>
 
 QmitkDiffusionApplicationPlugin* QmitkDiffusionApplicationPlugin::inst = nullptr;
 
 QmitkDiffusionApplicationPlugin::QmitkDiffusionApplicationPlugin()
 {
   inst = this;
 }
 
 QmitkDiffusionApplicationPlugin::~QmitkDiffusionApplicationPlugin()
 {
 }
 
 QmitkDiffusionApplicationPlugin* QmitkDiffusionApplicationPlugin::GetDefault()
 {
   return inst;
 }
 
 void QmitkDiffusionApplicationPlugin::start(ctkPluginContext* context)
 {
   berry::AbstractUICTKPlugin::start(context);
 
   this->context = context;
 
+  BERRY_REGISTER_EXTENSION_CLASS(QmitkWelcomePerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionImagingAppApplication, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionImagingAppIntroPart, context)
-  BERRY_REGISTER_EXTENSION_CLASS(QmitkWelcomePerspective, context)
 
 
   ctkServiceReference cmRef = context->getServiceReference<ctkConfigurationAdmin>();
   ctkConfigurationAdmin* configAdmin = nullptr;
   if (cmRef)
   {
     configAdmin = context->getService<ctkConfigurationAdmin>(cmRef);
   }
 
   // Use the CTK Configuration Admin service to configure the BlueBerry help system
 
   if (configAdmin)
   {
     ctkConfigurationPtr conf = configAdmin->getConfiguration("org.blueberry.services.help", QString());
     ctkDictionary helpProps;
     helpProps.insert("homePage", "qthelp://org.mitk.gui.qt.diffusionimagingapp/bundle/index.html");
     conf->update(helpProps);
     context->ungetService(cmRef);
   }
   else
   {
     MITK_WARN << "Configuration Admin service unavailable, cannot set home page url.";
   }
 }
 
 ctkPluginContext* QmitkDiffusionApplicationPlugin::GetPluginContext() const
 {
   return context;
 }