diff --git a/Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp b/Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp
index d2125a9725..31fdfb099e 100755
--- a/Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp
+++ b/Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp
@@ -1,505 +1,505 @@
 /*===================================================================
 
 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 <mitkBaseData.h>
 #include <mitkImageCast.h>
 #include <mitkImageToItk.h>
 #include <metaCommand.h>
 #include <mitkCommandLineParser.h>
 #include <mitkLog.h>
 #include <usAny.h>
 #include <itkImageFileWriter.h>
 #include <mitkIOUtil.h>
 #include <iostream>
 #include <fstream>
 #include <itksys/SystemTools.hxx>
 #include <mitkCoreObjectFactory.h>
 #include <omp.h>
 #include <itksys/SystemTools.hxx>
 
 #include <mitkFiberBundle.h>
 #include <itkStreamlineTrackingFilter.h>
 #include <Algorithms/TrackingHandlers/mitkTrackingDataHandler.h>
 #include <Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.h>
 #include <Algorithms/TrackingHandlers/mitkTrackingHandlerPeaks.h>
 #include <Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.h>
 #include <Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.h>
 #include <itkTensorImageToOdfImageFilter.h>
 #include <mitkTractographyForest.h>
 
 #define _USE_MATH_DEFINES
 #include <math.h>
 
 const int numOdfSamples = 200;
 typedef itk::Image< itk::Vector< float, numOdfSamples > , 3 > SampledShImageType;
 
 /*!
 \brief
 */
 int main(int argc, char* argv[])
 {
   mitkCommandLineParser parser;
 
   parser.setTitle("Streamline Tractography");
   parser.setCategory("Fiber Tracking and Processing Methods");
   parser.setDescription("Perform streamline tractography");
   parser.setContributor("MIC");
 
   // parameters fo all methods
   parser.setArgumentPrefix("--", "-");
 
   parser.beginGroup("1. Mandatory arguments:");
   parser.addArgument("input", "i", mitkCommandLineParser::StringList, "Input:", "input image (multiple possible for 'DetTensor' algorithm)", us::Any(), false);
   parser.addArgument("algorithm", "a", mitkCommandLineParser::String, "Algorithm:", "which algorithm to use (Peaks, DetTensor, ProbTensor, DetODF, ProbODF, DetRF, ProbRF)", us::Any(), false);
   parser.addArgument("out", "o", mitkCommandLineParser::OutputDirectory, "Output:", "output fiberbundle/probability map", us::Any(), false);
   parser.endGroup();
 
   parser.beginGroup("2. Seeding:");
   parser.addArgument("seeds", "", mitkCommandLineParser::Int, "Seeds per voxel:", "number of seed points per voxel", 1);
   parser.addArgument("seed_image", "", mitkCommandLineParser::String, "Seed image:", "mask image defining seed voxels", us::Any());
   parser.addArgument("trials_per_seed", "", mitkCommandLineParser::Int, "Max. trials per seed:", "try each seed N times until a valid streamline is obtained (only for probabilistic tractography)", 10);
   parser.addArgument("max_tracts", "", mitkCommandLineParser::Int, "Max. number of tracts:", "tractography is stopped if the reconstructed number of tracts is exceeded", -1);
   parser.endGroup();
 
   parser.beginGroup("3. Tractography constraints:");
   parser.addArgument("tracking_mask", "", mitkCommandLineParser::String, "Mask image:", "streamlines leaving the mask will stop immediately", us::Any());
   parser.addArgument("stop_image", "", mitkCommandLineParser::String, "Stop image:", "streamlines entering the mask will stop immediately", us::Any());
   parser.addArgument("target_image", "", mitkCommandLineParser::String, "Target image:", "effact depends on the chosen endpoint constraint (option ep_constraint)", us::Any());
   parser.addArgument("ep_constraint", "", mitkCommandLineParser::String, "Endpoint constraint:", "determines which fibers are accepted based on their endpoint location - options are NONE, EPS_IN_TARGET, EPS_IN_TARGET_LABELDIFF, EPS_IN_SEED_AND_TARGET, MIN_ONE_EP_IN_TARGET, ONE_EP_IN_TARGET and NO_EP_IN_TARGET", us::Any());
   parser.endGroup();
 
   parser.beginGroup("4. Streamline integration parameters:");
   parser.addArgument("sharpen_odfs", "", mitkCommandLineParser::Bool, "SHarpen ODFs:", "if you are using dODF images as input, it is advisable to sharpen the ODFs (min-max normalize and raise to the power of 4). this is not necessary for CSD fODFs, since they are narurally much sharper.");
   parser.addArgument("cutoff", "", mitkCommandLineParser::Float, "Cutoff:", "set the FA, GFA or Peak amplitude cutoff for terminating tracks", 0.1);
-  parser.addArgument("odf_cutoff", "", mitkCommandLineParser::Float, "ODF Cutoff:", "threshold on the ODF magnitude. this is useful in case of CSD fODF tractography.", 0.1);
+  parser.addArgument("odf_cutoff", "", mitkCommandLineParser::Float, "ODF Cutoff:", "threshold on the ODF magnitude. this is useful in case of CSD fODF tractography.", 0.0);
   parser.addArgument("step_size", "", mitkCommandLineParser::Float, "Step size:", "step size (in voxels)", 0.5);
   parser.addArgument("min_tract_length", "", mitkCommandLineParser::Float, "Min. tract length:", "minimum fiber length (in mm)", 20);
-  parser.addArgument("angular_threshold", "", mitkCommandLineParser::Float, "Angular threshold:", "angular threshold between two successive steps, (default: 90° * step_size)");
-  parser.addArgument("loop_check", "", mitkCommandLineParser::Float, "Check for loops:", "threshold on angular stdev over the last 4 voxel lengths", -1);
+  parser.addArgument("angular_threshold", "", mitkCommandLineParser::Float, "Angular threshold:", "angular threshold between two successive steps, (default: 90° * step_size, minimum 15°)");
+  parser.addArgument("loop_check", "", mitkCommandLineParser::Float, "Check for loops:", "threshold on angular stdev over the last 4 voxel lengths");
   parser.endGroup();
 
   parser.beginGroup("5. Neighborhood sampling:");
   parser.addArgument("num_samples", "", mitkCommandLineParser::Int, "Num. neighborhood samples:", "number of neighborhood samples that are use to determine the next progression direction", 0);
   parser.addArgument("sampling_distance", "", mitkCommandLineParser::Float, "Sampling distance:", "distance of neighborhood sampling points (in voxels)", 0.25);
   parser.addArgument("use_stop_votes", "", mitkCommandLineParser::Bool, "Use stop votes:", "use stop votes");
   parser.addArgument("use_only_forward_samples", "", mitkCommandLineParser::Bool, "Use only forward samples:", "use only forward samples");
   parser.endGroup();
 
   parser.beginGroup("6. Tensor tractography specific:");
   parser.addArgument("tend_f", "", mitkCommandLineParser::Float, "Weight f", "weighting factor between first eigenvector (f=1 equals FACT tracking) and input vector dependent direction (f=0).", 1.0);
   parser.addArgument("tend_g", "", mitkCommandLineParser::Float, "Weight g", "weighting factor between input vector (g=0) and tensor deflection (g=1 equals TEND tracking)", 0.0);
   parser.endGroup();
 
   parser.beginGroup("7. Random forest tractography specific:");
   parser.addArgument("forest", "", mitkCommandLineParser::String, "Forest:", "input random forest (HDF5 file)", us::Any());
   parser.addArgument("use_sh_features", "", mitkCommandLineParser::Bool, "Use SH features:", "use SH features");
   parser.endGroup();
 
   parser.beginGroup("8. Additional input:");
   parser.addArgument("additional_images", "", mitkCommandLineParser::StringList, "Additional images:", "specify a list of float images that hold additional information (FA, GFA, additional features for RF tractography)", us::Any());
   parser.endGroup();
 
   parser.beginGroup("9. Misc:");
   parser.addArgument("flip_x", "", mitkCommandLineParser::Bool, "Flip X:", "multiply x-coordinate of direction proposal by -1");
   parser.addArgument("flip_y", "", mitkCommandLineParser::Bool, "Flip Y:", "multiply y-coordinate of direction proposal by -1");
   parser.addArgument("flip_z", "", mitkCommandLineParser::Bool, "Flip Z:", "multiply z-coordinate of direction proposal by -1");
   parser.addArgument("no_data_interpolation", "", mitkCommandLineParser::Bool, "Don't interpolate input data:", "don't interpolate input image values");
   parser.addArgument("no_mask_interpolation", "", mitkCommandLineParser::Bool, "Don't interpolate masks:", "don't interpolate mask image values");
   parser.addArgument("compress", "", mitkCommandLineParser::Float, "Compress:", "compress output fibers using the given error threshold (in mm)");
   parser.endGroup();
 
   std::map<std::string, us::Any> parsedArgs = parser.parseArguments(argc, argv);
   if (parsedArgs.size()==0)
     return EXIT_FAILURE;
 
   mitkCommandLineParser::StringContainerType input_files = us::any_cast<mitkCommandLineParser::StringContainerType>(parsedArgs["input"]);
   std::string outFile = us::any_cast<std::string>(parsedArgs["out"]);
   std::string algorithm = us::any_cast<std::string>(parsedArgs["algorithm"]);
 
   bool sharpen_odfs = false;
   if (parsedArgs.count("sharpen_odfs"))
     sharpen_odfs = us::any_cast<bool>(parsedArgs["sharpen_odfs"]);
 
   bool interpolate = true;
   if (parsedArgs.count("no_data_interpolation"))
     interpolate = !us::any_cast<bool>(parsedArgs["no_data_interpolation"]);
 
   bool mask_interpolation = true;
   if (parsedArgs.count("no_mask_interpolation"))
     interpolate = !us::any_cast<bool>(parsedArgs["no_mask_interpolation"]);
 
   bool use_sh_features = false;
   if (parsedArgs.count("use_sh_features"))
     use_sh_features = us::any_cast<bool>(parsedArgs["use_sh_features"]);
 
   bool use_stop_votes = false;
   if (parsedArgs.count("use_stop_votes"))
     use_stop_votes = us::any_cast<bool>(parsedArgs["use_stop_votes"]);
 
   bool use_only_forward_samples = false;
   if (parsedArgs.count("use_only_forward_samples"))
     use_only_forward_samples = us::any_cast<bool>(parsedArgs["use_only_forward_samples"]);
 
   bool flip_x = false;
   if (parsedArgs.count("flip_x"))
     flip_x = us::any_cast<bool>(parsedArgs["flip_x"]);
   bool flip_y = false;
   if (parsedArgs.count("flip_y"))
     flip_y = us::any_cast<bool>(parsedArgs["flip_y"]);
   bool flip_z = false;
   if (parsedArgs.count("flip_z"))
     flip_z = us::any_cast<bool>(parsedArgs["flip_z"]);
 
   bool apply_image_rotation = false;
   if (parsedArgs.count("apply_image_rotation"))
     apply_image_rotation = us::any_cast<bool>(parsedArgs["apply_image_rotation"]);
 
   float compress = -1;
   if (parsedArgs.count("compress"))
     compress = us::any_cast<float>(parsedArgs["compress"]);
 
   float min_tract_length = 20;
   if (parsedArgs.count("min_tract_length"))
     min_tract_length = us::any_cast<float>(parsedArgs["min_tract_length"]);
 
   float loop_check = -1;
   if (parsedArgs.count("loop_check"))
     loop_check = us::any_cast<float>(parsedArgs["loop_check"]);
 
   std::string forestFile;
   if (parsedArgs.count("forest"))
     forestFile = us::any_cast<std::string>(parsedArgs["forest"]);
 
   std::string maskFile = "";
   if (parsedArgs.count("tracking_mask"))
     maskFile = us::any_cast<std::string>(parsedArgs["tracking_mask"]);
 
   std::string seedFile = "";
   if (parsedArgs.count("seed_image"))
     seedFile = us::any_cast<std::string>(parsedArgs["seed_image"]);
 
   std::string targetFile = "";
   if (parsedArgs.count("target_image"))
     targetFile = us::any_cast<std::string>(parsedArgs["target_image"]);
 
   std::string stopFile = "";
   if (parsedArgs.count("stop_image"))
     stopFile = us::any_cast<std::string>(parsedArgs["stop_image"]);
 
   std::string ep_constraint = "NONE";
   if (parsedArgs.count("ep_constraint"))
     ep_constraint = us::any_cast<std::string>(parsedArgs["ep_constraint"]);
 
   float cutoff = 0.1;
   if (parsedArgs.count("cutoff"))
     cutoff = us::any_cast<float>(parsedArgs["cutoff"]);
 
-  float odf_cutoff = 0.1;
+  float odf_cutoff = 0.0;
   if (parsedArgs.count("odf_cutoff"))
     odf_cutoff = us::any_cast<float>(parsedArgs["odf_cutoff"]);
 
   float stepsize = -1;
   if (parsedArgs.count("step_size"))
     stepsize = us::any_cast<float>(parsedArgs["step_size"]);
 
   float sampling_distance = -1;
   if (parsedArgs.count("sampling_distance"))
     sampling_distance = us::any_cast<float>(parsedArgs["sampling_distance"]);
 
   int num_samples = 0;
   if (parsedArgs.count("num_samples"))
     num_samples = us::any_cast<int>(parsedArgs["num_samples"]);
 
   int seeds = 1;
   if (parsedArgs.count("seeds"))
     seeds = us::any_cast<int>(parsedArgs["seeds"]);
 
   unsigned int trials_per_seed = 10;
   if (parsedArgs.count("trials_per_seed"))
     trials_per_seed = us::any_cast<int>(parsedArgs["trials_per_seed"]);
 
   float tend_f = 1;
   if (parsedArgs.count("tend_f"))
     tend_f = us::any_cast<float>(parsedArgs["tend_f"]);
 
   float tend_g = 0;
   if (parsedArgs.count("tend_g"))
     tend_g = us::any_cast<float>(parsedArgs["tend_g"]);
 
   float angular_threshold = -1;
   if (parsedArgs.count("angular_threshold"))
     angular_threshold = us::any_cast<float>(parsedArgs["angular_threshold"]);
 
   unsigned int max_tracts = -1;
   if (parsedArgs.count("max_tracts"))
     max_tracts = us::any_cast<int>(parsedArgs["max_tracts"]);
 
 
   std::string ext = itksys::SystemTools::GetFilenameExtension(outFile);
   if (ext != ".fib" && ext != ".trk")
   {
     MITK_INFO << "Output file format not supported. Use one of .fib, .trk, .nii, .nii.gz, .nrrd";
     return EXIT_FAILURE;
   }
 
   // LOAD DATASETS
   mitkCommandLineParser::StringContainerType addFiles;
   if (parsedArgs.count("additional_images"))
     addFiles = us::any_cast<mitkCommandLineParser::StringContainerType>(parsedArgs["additional_images"]);
 
   typedef itk::Image<float, 3> ItkFloatImgType;
 
   MITK_INFO << "loading input";
   std::vector< mitk::Image::Pointer > input_images;
   for (unsigned int i=0; i<input_files.size(); i++)
   {
     mitk::Image::Pointer mitkImage = dynamic_cast<mitk::Image*>(mitk::IOUtil::Load(input_files.at(i))[0].GetPointer());
     input_images.push_back(mitkImage);
   }
 
   ItkFloatImgType::Pointer mask;
   if (!maskFile.empty())
   {
     MITK_INFO << "loading mask image";
     mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(mitk::IOUtil::Load(maskFile)[0].GetPointer());
     mask = ItkFloatImgType::New();
     mitk::CastToItkImage(img, mask);
   }
 
   ItkFloatImgType::Pointer seed;
   if (!seedFile.empty())
   {
     MITK_INFO << "loading seed image";
     mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(mitk::IOUtil::Load(seedFile)[0].GetPointer());
     seed = ItkFloatImgType::New();
     mitk::CastToItkImage(img, seed);
   }
 
   ItkFloatImgType::Pointer stop;
   if (!stopFile.empty())
   {
     MITK_INFO << "loading stop image";
     mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(mitk::IOUtil::Load(stopFile)[0].GetPointer());
     stop = ItkFloatImgType::New();
     mitk::CastToItkImage(img, stop);
   }
 
   ItkFloatImgType::Pointer target;
   if (!targetFile.empty())
   {
     MITK_INFO << "loading target image";
     mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(mitk::IOUtil::Load(targetFile)[0].GetPointer());
     target = ItkFloatImgType::New();
     mitk::CastToItkImage(img, target);
   }
 
   MITK_INFO << "loading additional images";
   std::vector< std::vector< ItkFloatImgType::Pointer > > addImages;
   addImages.push_back(std::vector< ItkFloatImgType::Pointer >());
   for (auto file : addFiles)
   {
     mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(mitk::IOUtil::Load(file)[0].GetPointer());
     ItkFloatImgType::Pointer itkimg = ItkFloatImgType::New();
     mitk::CastToItkImage(img, itkimg);
     addImages.at(0).push_back(itkimg);
   }
 
   //    //////////////////////////////////////////////////////////////////
 //      omp_set_num_threads(1);
 
   if (algorithm == "ProbTensor")
   {
     typedef mitk::ImageToItk< mitk::TrackingHandlerTensor::ItkTensorImageType > CasterType;
     CasterType::Pointer caster = CasterType::New();
     caster->SetInput(input_images.at(0));
     caster->Update();
     mitk::TrackingHandlerTensor::ItkTensorImageType::Pointer itkTensorImg = caster->GetOutput();
 
     typedef itk::TensorImageToOdfImageFilter< float, float > FilterType;
     FilterType::Pointer filter = FilterType::New();
     filter->SetInput( itkTensorImg );
     filter->Update();
 
     mitk::Image::Pointer image = mitk::Image::New();
     FilterType::OutputImageType::Pointer outimg = filter->GetOutput();
     image->InitializeByItk( outimg.GetPointer() );
     image->SetVolume( outimg->GetBufferPointer() );
 
     input_images.clear();
     input_images.push_back(image);
 
     sharpen_odfs = true;
     odf_cutoff = 0;
   }
 
   typedef itk::StreamlineTrackingFilter TrackerType;
   TrackerType::Pointer tracker = TrackerType::New();
 
   mitk::TrackingDataHandler* handler;
   if (algorithm == "DetRF" || algorithm == "ProbRF")
   {
     mitk::TractographyForest::Pointer forest = dynamic_cast<mitk::TractographyForest*>(mitk::IOUtil::Load(forestFile)[0].GetPointer());
     if (forest.IsNull())
       mitkThrow() << "Forest file " << forestFile << " could not be read.";
 
     if (use_sh_features)
     {
       handler = new mitk::TrackingHandlerRandomForest<6,28>();
       dynamic_cast<mitk::TrackingHandlerRandomForest<6,28>*>(handler)->SetForest(forest);
       dynamic_cast<mitk::TrackingHandlerRandomForest<6,28>*>(handler)->AddDwi(input_images.at(0));
       dynamic_cast<mitk::TrackingHandlerRandomForest<6,28>*>(handler)->SetAdditionalFeatureImages(addImages);
     }
     else
     {
       handler = new mitk::TrackingHandlerRandomForest<6,100>();
       dynamic_cast<mitk::TrackingHandlerRandomForest<6,100>*>(handler)->SetForest(forest);
       dynamic_cast<mitk::TrackingHandlerRandomForest<6,100>*>(handler)->AddDwi(input_images.at(0));
       dynamic_cast<mitk::TrackingHandlerRandomForest<6,100>*>(handler)->SetAdditionalFeatureImages(addImages);
     }
 
     if (algorithm == "ProbRF")
       handler->SetMode(mitk::TrackingDataHandler::MODE::PROBABILISTIC);
   }
   else if (algorithm == "Peaks")
   {
     handler = new mitk::TrackingHandlerPeaks();
 
     typedef mitk::ImageToItk< mitk::TrackingHandlerPeaks::PeakImgType > CasterType;
     CasterType::Pointer caster = CasterType::New();
     caster->SetInput(input_images.at(0));
     caster->Update();
     mitk::TrackingHandlerPeaks::PeakImgType::Pointer itkImg = caster->GetOutput();
 
     dynamic_cast<mitk::TrackingHandlerPeaks*>(handler)->SetPeakImage(itkImg);
     dynamic_cast<mitk::TrackingHandlerPeaks*>(handler)->SetApplyDirectionMatrix(apply_image_rotation);
     dynamic_cast<mitk::TrackingHandlerPeaks*>(handler)->SetPeakThreshold(cutoff);
   }
   else if (algorithm == "DetTensor")
   {
     handler = new mitk::TrackingHandlerTensor();
 
     for (auto input_image : input_images)
     {
       typedef mitk::ImageToItk< mitk::TrackingHandlerTensor::ItkTensorImageType > CasterType;
       CasterType::Pointer caster = CasterType::New();
       caster->SetInput(input_image);
       caster->Update();
       mitk::TrackingHandlerTensor::ItkTensorImageType::ConstPointer itkImg = caster->GetOutput();
       dynamic_cast<mitk::TrackingHandlerTensor*>(handler)->AddTensorImage(itkImg);
     }
 
     dynamic_cast<mitk::TrackingHandlerTensor*>(handler)->SetFaThreshold(cutoff);
     dynamic_cast<mitk::TrackingHandlerTensor*>(handler)->SetF(tend_f);
     dynamic_cast<mitk::TrackingHandlerTensor*>(handler)->SetG(tend_g);
 
     if (addImages.at(0).size()>0)
       dynamic_cast<mitk::TrackingHandlerTensor*>(handler)->SetFaImage(addImages.at(0).at(0));
   }
   else if (algorithm == "DetODF" || algorithm == "ProbODF" || algorithm == "ProbTensor")
   {
     handler = new mitk::TrackingHandlerOdf();
 
     typedef mitk::ImageToItk< mitk::TrackingHandlerOdf::ItkOdfImageType > CasterType;
     CasterType::Pointer caster = CasterType::New();
     caster->SetInput(input_images.at(0));
     caster->Update();
     mitk::TrackingHandlerOdf::ItkOdfImageType::Pointer itkImg = caster->GetOutput();
     dynamic_cast<mitk::TrackingHandlerOdf*>(handler)->SetOdfImage(itkImg);
 
     dynamic_cast<mitk::TrackingHandlerOdf*>(handler)->SetGfaThreshold(cutoff);
     dynamic_cast<mitk::TrackingHandlerOdf*>(handler)->SetOdfThreshold(odf_cutoff);
     dynamic_cast<mitk::TrackingHandlerOdf*>(handler)->SetSharpenOdfs(sharpen_odfs);
 
     if (algorithm == "ProbODF" || algorithm == "ProbTensor")
       dynamic_cast<mitk::TrackingHandlerOdf*>(handler)->SetMode(mitk::TrackingHandlerOdf::MODE::PROBABILISTIC);
     if (algorithm == "ProbTensor")
       dynamic_cast<mitk::TrackingHandlerOdf*>(handler)->SetIsOdfFromTensor(true);
 
     if (addImages.at(0).size()>0)
       dynamic_cast<mitk::TrackingHandlerOdf*>(handler)->SetGfaImage(addImages.at(0).at(0));
   }
   else
   {
     MITK_INFO << "Unknown tractography algorithm (" + algorithm+"). Known types are Peaks, DetTensor, ProbTensor, DetODF, ProbODF, DetRF, ProbRF.";
     return EXIT_FAILURE;
   }
   handler->SetInterpolate(interpolate);
   handler->SetFlipX(flip_x);
   handler->SetFlipY(flip_y);
   handler->SetFlipZ(flip_z);
 
   if (ep_constraint=="NONE")
     tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::NONE);
   else if (ep_constraint=="EPS_IN_TARGET")
     tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::EPS_IN_TARGET);
   else if (ep_constraint=="EPS_IN_TARGET_LABELDIFF")
     tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::EPS_IN_TARGET_LABELDIFF);
   else if (ep_constraint=="EPS_IN_SEED_AND_TARGET")
     tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::EPS_IN_SEED_AND_TARGET);
   else if (ep_constraint=="MIN_ONE_EP_IN_TARGET")
     tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::MIN_ONE_EP_IN_TARGET);
   else if (ep_constraint=="ONE_EP_IN_TARGET")
     tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::ONE_EP_IN_TARGET);
   else if (ep_constraint=="NO_EP_IN_TARGET")
     tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::NO_EP_IN_TARGET);
 
   MITK_INFO << "Tractography algorithm: " << algorithm;
   tracker->SetInterpolateMasks(mask_interpolation);
   tracker->SetNumberOfSamples(num_samples);
   tracker->SetAngularThreshold(angular_threshold);
   tracker->SetMaskImage(mask);
   tracker->SetSeedImage(seed);
   tracker->SetStoppingRegions(stop);
   tracker->SetTargetRegions(target);
   tracker->SetSeedsPerVoxel(seeds);
   tracker->SetStepSize(stepsize);
   tracker->SetSamplingDistance(sampling_distance);
   tracker->SetUseStopVotes(use_stop_votes);
   tracker->SetOnlyForwardSamples(use_only_forward_samples);
   tracker->SetLoopCheck(loop_check);
   tracker->SetMaxNumTracts(max_tracts);
   tracker->SetTrialsPerSeed(trials_per_seed);
   tracker->SetTrackingHandler(handler);
   if (ext != ".fib" && ext != ".trk")
     tracker->SetUseOutputProbabilityMap(true);
   tracker->SetMinTractLength(min_tract_length);
   tracker->Update();
 
   if (ext == ".fib" || ext == ".trk")
   {
     vtkSmartPointer< vtkPolyData > poly = tracker->GetFiberPolyData();
     mitk::FiberBundle::Pointer outFib = mitk::FiberBundle::New(poly);
     if (compress > 0)
       outFib->Compress(compress);
     mitk::IOUtil::Save(outFib, outFile);
   }
   else
   {
     TrackerType::ItkDoubleImgType::Pointer outImg = tracker->GetOutputProbabilityMap();
     mitk::Image::Pointer img = mitk::Image::New();
     img->InitializeByItk(outImg.GetPointer());
     img->SetVolume(outImg->GetBufferPointer());
 
     if (ext != ".nii" && ext != ".nii.gz" && ext != ".nrrd")
       outFile += ".nii.gz";
 
     mitk::IOUtil::Save(img, outFile);
   }
 
   delete handler;
 
   return EXIT_SUCCESS;
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsDataViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsDataViewControls.ui
index cd6dd69285..5a68d94544 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsDataViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsDataViewControls.ui
@@ -1,218 +1,269 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkConnectomicsDataViewControls</class>
  <widget class="QWidget" name="QmitkConnectomicsDataViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>227</width>
+    <width>231</width>
     <height>639</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="inputDataGroupBox">
      <property name="title">
       <string>Data</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QLabel" name="lblWarning">
         <property name="styleSheet">
          <string notr="true">QLabel { color: rgb(255, 0, 0) }</string>
         </property>
         <property name="text">
-         <string>Please select data!</string>
+         <string>Select a parcellation and a tractogram!</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QLabel" name="inputImageOneLabel">
           <property name="text">
            <string>Image 1:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="inputImageOneNameLabel">
           <property name="text">
            <string>-</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
+      <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <widget class="QLabel" name="inputImageTwoLabel">
           <property name="text">
            <string>Image 2:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="inputImageTwoNameLabel">
           <property name="text">
            <string>-</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="networkCreationOptionsGroupBox">
      <property name="title">
       <string>Network Creation Options</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="1" column="0">
+       <widget class="QPushButton" name="networkifyPushButton">
+        <property name="toolTip">
+         <string>Create a network from a parcellation and a fiber image</string>
+        </property>
+        <property name="text">
+         <string>Networkify</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QPushButton" name="createCorrelationMatrixPushButton">
+        <property name="text">
+         <string>Create Correlation Matrix</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
        <widget class="QComboBox" name="mappingStrategyComboBox"/>
       </item>
+      <item row="3" column="0">
+       <widget class="QPushButton" name="syntheticNetworkCreationPushButton">
+        <property name="text">
+         <string>Create Synthetic Networks</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QPushButton" name="networkifyPushButton">
-     <property name="toolTip">
-      <string>Create a network from a parcellation and a fiber image</string>
-     </property>
-     <property name="text">
-      <string>Networkify</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="createCorrelationMatrixPushButton">
-     <property name="text">
-      <string>Create Correlation Matrix</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="syntheticNetworkCreationPushButton">
-     <property name="text">
-      <string>Create Synthetic Networks</string>
-     </property>
-    </widget>
-   </item>
-   <item>
+   <item row="5" column="0">
     <widget class="QGroupBox" name="syntheticNetworkOptionsGroupBox">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="title">
       <string>Synthetic Network Options</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QComboBox" name="syntheticNetworkComboBox"/>
       </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLabel" name="parameterOneLabel">
           <property name="text">
            <string>Parameter 1</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QSpinBox" name="parameterOneSpinBox">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="maximum">
            <number>9999</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
+      <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QLabel" name="parameterTwoLabel">
           <property name="text">
            <string>Parameter 2</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QDoubleSpinBox" name="parameterTwoDoubleSpinBox">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="decimals">
            <number>3</number>
           </property>
           <property name="maximum">
            <double>999.899999999999977</double>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="6" column="0">
     <widget class="QGroupBox" name="parcellationGroupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Anatomical labeling</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_5">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QmitkFreeSurferParcellationWidget" name="parcellationWidget" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="7" column="0">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkFreeSurferParcellationWidget</class>
    <extends>QWidget</extends>
    <header>QmitkFreeSurferParcellationWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsNetworkOperationsViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsNetworkOperationsViewControls.ui
index 6f694d8131..ff4edee6d1 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsNetworkOperationsViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsNetworkOperationsViewControls.ui
@@ -1,237 +1,276 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkConnectomicsNetworkOperationsViewControls</class>
  <widget class="QWidget" name="QmitkConnectomicsNetworkOperationsViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>227</width>
+    <width>283</width>
     <height>639</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="inputDataGroupBox">
      <property name="title">
       <string>Data</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QLabel" name="lblWarning">
         <property name="styleSheet">
          <string notr="true">QLabel { color: rgb(255, 0, 0) }</string>
         </property>
         <property name="text">
-         <string>Please select data!</string>
+         <string>Select a network or a parcellation!</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QLabel" name="inputImageOneLabel">
           <property name="text">
            <string>Image 1:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="inputImageOneNameLabel">
           <property name="text">
            <string>-</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QPushButton" name="convertToRGBAImagePushButton">
+        <property name="toolTip">
+         <string>Convert the selected image to RGBA format</string>
+        </property>
+        <property name="text">
+         <string>Turn Into RGBA Image</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="assignFreeSurferColorsPushButton">
+        <property name="text">
+         <string>Assign FreeSurfer Colors</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="modularizePushButton">
+        <property name="text">
+         <string>Divide in Modules</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QPushButton" name="convertToRGBAImagePushButton">
-     <property name="toolTip">
-      <string>Convert the selected image to RGBA format</string>
-     </property>
-     <property name="text">
-      <string>Turn Into RGBA Image</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="assignFreeSurferColorsPushButton">
-     <property name="text">
-      <string>Assign FreeSurfer Colors</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="modularizePushButton">
-     <property name="text">
-      <string>Divide in Modules</string>
-     </property>
-    </widget>
-   </item>
-   <item>
+   <item row="4" column="0">
     <widget class="QGroupBox" name="connectivityMatrixImageGroupBox">
      <property name="title">
       <string>Connectivity Matrix Image Options</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_6">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QPushButton" name="createConnectivityMatrixImagePushButton">
         <property name="text">
          <string>Create Connectivity Matrix Image</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_7">
         <item>
          <widget class="QCheckBox" name="rescaleCheckBox">
           <property name="text">
            <string>Rescale</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
+      <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_6">
         <item>
          <widget class="QCheckBox" name="binaryCheckBox">
           <property name="text">
            <string>Binary</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0">
     <widget class="QGroupBox" name="pruneOptionsGroupBox">
      <property name="title">
       <string>Prune Options</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_5">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QPushButton" name="prunePushButton">
         <property name="text">
          <string>Prune Network</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="QLabel" name="targetDensityLabel">
             <property name="text">
              <string>Target Density</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QDoubleSpinBox" name="densityThresholdDoubleSpinBox">
             <property name="maximum">
              <double>1.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.010000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </item>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <widget class="QLabel" name="targetThresholdLabel">
             <property name="text">
              <string>Target Threshold</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QSpinBox" name="targetThresholdSpinBox"/>
           </item>
          </layout>
         </item>
        </layout>
       </item>
-      <item>
+      <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_5">
         <item>
          <widget class="QCheckBox" name="thresholdBasedThresholdingCheckBox">
           <property name="toolTip">
            <string extracomment="Remove all edges below at and below weight"/>
           </property>
           <property name="text">
            <string>Threshold weight</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
+      <item row="3" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QCheckBox" name="largestDensityLowerThanCheckBox">
           <property name="toolTip">
            <string extracomment="Remove all edges of the weakest weight until below target density"/>
           </property>
           <property name="text">
            <string>Threshold Below Density</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
+      <item row="4" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QCheckBox" name="RandomRemovalThresholdingCheckBox">
           <property name="toolTip">
            <string extracomment="Randomly remove one of the lowest weight edges until the target density is reached"/>
           </property>
           <property name="text">
            <string>Random Removal Threshold</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="6" column="0">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsStatisticsViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsStatisticsViewControls.ui
index 5eb919aef6..b3d941a458 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsStatisticsViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkConnectomicsStatisticsViewControls.ui
@@ -1,251 +1,296 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkConnectomicsStatisticsViewControls</class>
  <widget class="QWidget" name="QmitkConnectomicsStatisticsViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>557</width>
     <height>1218</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="inputDataGroupBox">
      <property name="title">
       <string>Data</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QLabel" name="lblWarning">
         <property name="styleSheet">
          <string notr="true">QLabel { color: rgb(255, 0, 0) }</string>
         </property>
         <property name="text">
-         <string>Please select data!</string>
+         <string>Select a network!</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QLabel" name="inputImageOneLabel">
           <property name="text">
            <string>Network:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="inputImageOneNameLabel">
           <property name="text">
            <string>-</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="networkStatisticsGroupBox">
      <property name="title">
       <string>Network Statistics</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
       </property>
-      <item row="0" column="0" colspan="2">
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QPlainTextEdit" name="networkStatisticsPlainTextEdit">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="networkBalloonsGroupBox">
      <property name="title">
       <string>Informational Balloons.</string>
      </property>
-     <layout class="QFormLayout" name="formLayout_2">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <property name="leftMargin">
+       <number>0</number>
       </property>
-      <item row="3" column="0" colspan="2">
-       <widget class="QPlainTextEdit" name="networkBalloonsPlainTextEdit">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="networkBalloonsTextOverlayCheckBox">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
-        <property name="font">
-         <font>
-          <family>MS Shell Dlg 2</family>
-          <pointsize>8</pointsize>
-         </font>
+        <property name="cursor">
+         <cursorShape>PointingHandCursor</cursorShape>
         </property>
-        <property name="cursor" stdset="0">
-         <cursorShape>IBeamCursor</cursorShape>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
         </property>
-        <property name="acceptDrops">
-         <bool>false</bool>
+        <property name="text">
+         <string/>
         </property>
-        <property name="readOnly">
+        <property name="checked">
          <bool>true</bool>
         </property>
+        <property name="tristate">
+         <bool>false</bool>
+        </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="0" column="1">
        <widget class="QComboBox" name="networkBalloonsNodeLabelsComboBox">
         <property name="editable">
          <bool>false</bool>
         </property>
         <property name="currentIndex">
          <number>-1</number>
         </property>
         <property name="maxVisibleItems">
          <number>12</number>
         </property>
         <property name="insertPolicy">
          <enum>QComboBox::InsertAlphabetically</enum>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="networkBalloonsTextOverlayCheckBox">
-        <property name="enabled">
-         <bool>false</bool>
+      <item row="1" column="0" colspan="2">
+       <widget class="QPlainTextEdit" name="networkBalloonsPlainTextEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
+        <property name="font">
+         <font>
+          <family>MS Shell Dlg 2</family>
+          <pointsize>8</pointsize>
+         </font>
         </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
+        <property name="cursor" stdset="0">
+         <cursorShape>IBeamCursor</cursorShape>
         </property>
-        <property name="text">
-         <string/>
+        <property name="acceptDrops">
+         <bool>false</bool>
         </property>
-        <property name="checked">
+        <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="tristate">
-         <bool>false</bool>
-        </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QGroupBox" name="histogramGroupBox">
      <property name="title">
       <string>Histograms</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QmitkNetworkHistogramCanvas" name="degreeNetworkHistogramCanvas" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>50</width>
           <height>150</height>
          </size>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QmitkNetworkHistogramCanvas" name="betweennessNetworkHistogramCanvas" native="true">
         <property name="minimumSize">
          <size>
           <width>50</width>
           <height>150</height>
          </size>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QmitkNetworkHistogramCanvas" name="shortestPathNetworkHistogramCanvas" native="true">
         <property name="minimumSize">
          <size>
           <width>50</width>
           <height>150</height>
          </size>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkNetworkHistogramCanvas</class>
    <extends>QWidget</extends>
    <header location="global">internal/QmitkNetworkHistogramCanvas.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>networkBalloonsNodeLabelsComboBox</sender>
    <signal>currentIndexChanged(int)</signal>
    <receiver>networkBalloonsNodeLabelsComboBox</receiver>
    <slot>setCurrentIndex(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>360</x>
      <y>409</y>
     </hint>
     <hint type="destinationlabel">
      <x>360</x>
      <y>409</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkRandomParcellationViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkRandomParcellationViewControls.ui
index e60f45f3f8..2d6c8c7e09 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkRandomParcellationViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/QmitkRandomParcellationViewControls.ui
@@ -1,244 +1,313 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkRandomParcellationViewControls</class>
  <widget class="QWidget" name="QmitkRandomParcellationViewControls">
   <property name="enabled">
    <bool>true</bool>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>249</width>
-    <height>517</height>
+    <width>327</width>
+    <height>591</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QLabel" name="labelWarning">
      <property name="styleSheet">
       <string notr="true">QLabel { color: rgb(255, 0, 0) }</string>
      </property>
      <property name="text">
       <string>Please select an image!</string>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="groupBoxNumberNodes">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="title">
       <string>Nodes</string>
      </property>
      <property name="checkable">
       <bool>false</bool>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="text">
          <string>Choose the number of nodes:</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QSpinBox" name="spinBoxNumberNodes">
         <property name="minimum">
          <number>2</number>
         </property>
         <property name="maximum">
          <number>5000</number>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="groupBoxMerging">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="title">
       <string>Merging</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QCheckBox" name="checkBoxMerging">
         <property name="text">
          <string>Merging on</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QFrame" name="frameMerging">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
+         <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_7">
-         <item>
+        <layout class="QGridLayout" name="gridLayout_5">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
           <widget class="QRadioButton" name="radioButtonNumberParcels">
            <property name="text">
             <string>According to the number of parcels</string>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="0">
           <widget class="QFrame" name="frameNumberParcels">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
-           <layout class="QVBoxLayout" name="verticalLayout_5">
-            <item>
+           <layout class="QGridLayout" name="gridLayout_6">
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item row="0" column="0">
              <widget class="QLabel" name="label_3">
               <property name="text">
                <string>Number of Parcels:</string>
               </property>
              </widget>
             </item>
-            <item>
+            <item row="1" column="0">
              <widget class="QSpinBox" name="spinBoxNumberParcels">
               <property name="minimum">
                <number>1</number>
               </property>
               <property name="maximum">
                <number>5000</number>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
-         <item>
+         <item row="2" column="0">
           <widget class="QRadioButton" name="radioButtonSmallestParcel">
            <property name="text">
             <string>According to the size of parcels</string>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="3" column="0">
           <widget class="QFrame" name="frameSmallestParcel">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
-            <item>
+           <layout class="QGridLayout" name="gridLayout_7">
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item row="0" column="0">
              <widget class="QLabel" name="label_2">
               <property name="text">
                <string>Size of the smallest parcel:</string>
               </property>
              </widget>
             </item>
-            <item>
+            <item row="1" column="0">
              <widget class="QSpinBox" name="spinBoxSmallestParcel">
               <property name="minimum">
                <number>2</number>
               </property>
               <property name="maximum">
                <number>100000</number>
               </property>
              </widget>
             </item>
-            <item>
+            <item row="2" column="0">
              <widget class="QCheckBox" name="checkBoxJustMergeSmallParcels">
               <property name="text">
                <string>Just merge small parcels</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QPushButton" name="buttonSelectRandomNodes">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Do image processing</string>
      </property>
      <property name="text">
       <string>Select random nodes</string>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item>
+   <item row="5" column="0">
     <widget class="QGroupBox" name="groupBoxCounting">
      <property name="title">
       <string>Counting</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_6">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QLabel" name="labelNumberVoxels">
         <property name="text">
          <string>Number of voxels with value 1:</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QLabel" name="labelNumberNodes">
         <property name="text">
          <string>Number of nodes:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/plugin.xml
index 971eeb1a8c..c9f2eddab2 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/plugin.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
 
     <view id="org.mitk.views.denoisingview"
-    name="DWI Denoising"
+    name="Denoising"
     category="Preprocessing"
     class="QmitkDenoisingView"
     icon="resources/denoisingicon.png">
     <keywordReference id="org.mitk.views.denoisingview.Keyword"/>
     </view>
-    
+
   </extension>
-     
+
 
   <extension point="org.blueberry.ui.keywords">
 
 
-  
-  </extension>  
-  
+
+  </extension>
+
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingViewControls.ui
index 340b789ecd..c735b2f757 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingViewControls.ui
@@ -1,345 +1,345 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkDenoisingViewControls</class>
  <widget class="QWidget" name="QmitkDenoisingViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>351</width>
     <height>734</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>6</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>9</number>
    </property>
    <property name="topMargin">
     <number>9</number>
    </property>
    <property name="rightMargin">
     <number>9</number>
    </property>
    <property name="bottomMargin">
     <number>9</number>
    </property>
-   <item>
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QFrame" name="frame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="m_DwiLabel">
         <property name="text">
          <string>Input Image:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QmitkDataStorageComboBox" name="m_InputImageBox"/>
       </item>
       <item row="1" column="1">
        <widget class="QComboBox" name="m_SelectFilterComboBox">
         <item>
          <property name="text">
           <string>Total-variation</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Discrete Gaussian</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Non-local means</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="m_DwiLabel_2">
         <property name="text">
          <string>Filter:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="m_TvFrame">
      <property name="title">
       <string>Parameters</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_5">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="m_LabelParameter_4">
         <property name="text">
          <string>Lambda:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QDoubleSpinBox" name="m_TvLambdaBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
         <property name="value">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="m_LabelParameter_5">
         <property name="text">
          <string>Iterations:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QSpinBox" name="m_TvIterationsBox">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>999</number>
         </property>
         <property name="value">
          <number>1</number>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="m_NlmFrame">
      <property name="title">
       <string>Parameters</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="m_LabelParameter_6">
         <property name="text">
          <string>Sampling Radius:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QSpinBox" name="m_NlmNumPatchesBox">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>999</number>
         </property>
         <property name="value">
          <number>10</number>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QSpinBox" name="m_NlmIterationsBox">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>999</number>
         </property>
         <property name="value">
          <number>4</number>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QSpinBox" name="m_NlmSearchRadiusBox">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>999</number>
         </property>
         <property name="value">
          <number>4</number>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="m_LabelParameter_11">
         <property name="text">
          <string>Num. Patches:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QSpinBox" name="m_NlmPatchSizeBox">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>50</number>
         </property>
         <property name="value">
          <number>1</number>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="m_LabelParameter_9">
         <property name="text">
          <string>Iterations:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="m_LabelParameter_7">
         <property name="text">
          <string>Patch Size:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QGroupBox" name="m_GaussFrame">
      <property name="title">
       <string>Parameters</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_7">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="1">
        <widget class="QDoubleSpinBox" name="m_GaussVarianceBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>1.000000000000000</double>
         </property>
         <property name="maximum">
          <double>99999.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
         <property name="value">
          <double>1.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="m_LabelParameter_10">
         <property name="text">
          <string>Variance:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <widget class="QCommandLinkButton" name="m_ApplyButton">
      <property name="text">
       <string>Start</string>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/documentation/UserManual/QmitkFiberfoxViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/documentation/UserManual/QmitkFiberfoxViewUserManual.dox
index acc3981702..981d333f71 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/documentation/UserManual/QmitkFiberfoxViewUserManual.dox
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/documentation/UserManual/QmitkFiberfoxViewUserManual.dox
@@ -1,150 +1,149 @@
 /**
 \page org_mitk_views_fiberfoxview Fiberfox DW-MRI Simulation
 
 This view provides the user interface for Fiberfox [1,2,3], an interactive simulation tool for defining artificial white matter fibers and generating corresponding diffusion-weighted images.
 Arbitrary fiber configurations like bent, crossing, kissing, twisting, and fanning bundles can be intuitively defined by positioning only a few 3D waypoints to trigger the automated generation of synthetic fibers.
 From these fibers a diffusion-weighted signal is simulated using a flexible combination of various diffusion models.
 Instead of using manually created artificial fiber bundles, fibers obtained in any other way, e.g. using fiber tractography, can be used to simulate the signal (Example: <a href="http://www.tractometer.org/ismrm_2015_challenge/">ISMRM Tractography Challenge</a>).
 The simulation can be modified using specified acquisition settings such as gradient direction, b-value, image size, image resolution, echo time, and much more.
 Additionally it enables the simulation of magnetic resonance artifacts including thermal noise, Gibbs ringing, N/2 ghosting, aliasing, susceptibility distortions, eddy currents and motion artifacts.
 The employed parameters can be saved and loaded as xml file with the ending ".ffp" (Fiberfox parameters).
 It is furthermore possible to add artifacts to an already existing diffusion-weighted image.
 
 <b>Available sections:</b>
   - \ref QmitkFiberfoxViewUserManualFiberDefinition
   - \ref QmitkFiberfoxViewUserManualSignalGeneration
   - \ref QmitkFiberfoxViewUserManualKnownIssues
   - \ref QmitkFiberfoxViewUserManualReferences
-\imageMacro{Fiberfox.png, "Fig. 1: Screenshot of the Fiberfox framework. The four render windows display an axial (top left)\, sagittal (top right) and coronal (bottom left) 2D cut as well as a 3D view of a synthetic fiber helix and the fiducials used to define its shape. In the 2D views the helix is superimposing the baseline volume of the corresponding diffusion-weighted image. The sagittal render window shows a close-up view on one of the circular fiducials.",16}
 
 \section QmitkFiberfoxViewUserManualFiberDefinition Fiber Definition
 
 Fiber strands are defined simply by placing markers in a 3D image volume. The fibers are then interpolated between these fiducials.
 
 
 <b>Example:</b>
 \li Chose an image volume to place the markers used to define the fiber pathway. If you don't have such an image available switch to the "Signal Generation" tab, define the size and spacing of the desired image and click "Generate Image". If no fiber bundle is selected, this will generate a dummy image that can be used to place the fiducials.
 \li Start placing fiducials at the desired positions to define the fiber pathway. To do that, click on the button with the circle pictogram, then click at the desired position and plane in the image volume and drag your mouse while keeping the button pressed to generate a circular shape. Adjust the shape using the control points (Fig. 2). The position of control point D introduces a twist of the fibers between two successive fiducials. The actual fiber generation is triggered automatically as soon as you place the second control point.
 \li In some cases the fibers are entangled in a way that can't be resolved by introducing an additional fiber twist. Fiberfox tries to avoid these situations, which arise from different normal orientations of succeeding fiducials, automatically. In rare cases this is not successful. Use the double-arrow button to flip the fiber positions of the selected fiducial in one dimension. Either the problem is resolved now or you can resolve it manually by adjusting the twist-control point.
 \li To create non elliptical fiber profile shapes switch to the Fiber Extraction View. This view provides tools to extract subesets of fibers from fiber bundles and enables to cut out arbitrary polygonal fiber shapes from existing bundles.
 
 \imageMacro{Fiberfox-Fiducial.png, "Fig. 2: Control points defining the actual shape of the fiducial. A specifies the fiducials position in space\, B and C the two ellipse radii and D the twisting angle between two successive fiducials.",10}
 
 <b>Fiber Options:</b>
 \li <b>Real Time Fibers</b>: If checked, each parameter adjustment (fiducial position, number of fibers, ...) will be directly applied to the selected fiber bundle. If unchecked, the fibers will only be generated if the corresponding button "Generate Fibers" is clicked.
 \li <b>Fiber Distribution</b>: Specifies if the fiber distribution inside the bundle follows a uniform or normal distribution.
 \li <b>\# Fibers</b>: Specifies the number of fibers that will be generated for the selected bundle.
 \li <b>Advanced Options</b>: Show/hide advanced options
 \li <b>Fiber Sampling</b>: Adjusts the distenace of the fiber sampling points (in mm). A higher sampling rate is needed if high curvatures are modeled.
 \li <b>Tension, Continuity, Bias</b>: Parameters controlling the shape of the splines interpolation the fiducials. See <a href="http://en.wikipedia.org/wiki/Kochanek%E2%80%93Bartels_spline">Wikipedia</a> for details.
 
 
 <b>Fiducial Options:</b>
 \li <b>Use Constant Fiducial Radius</b>: If checked, all fiducials are treated as circles with the same radius. The first fiducial of the bundle defines the radius of all other fiducials.
 \li <b>Align with grid</b>: Click to shift the selected fiducial center points to the next voxel center.
 
 <b>Operations:</b>
 \li <b>Rotation</b>: Define the rotation of the selected fiber bundle around each axis (in degree).
 \li <b>Translation</b>: Define the translation of the selected fiber bundle along each axis (in mm).
 \li <b>Scaling</b>: Define a scaling factor for the selected fiber bundle in each dimension.
 \li <b>Transform Selection</b>: Apply specified rotation, translation and scaling to the selected Bundle/Fiducial
 \li <b>Copy Bundles</b>: Add copies of the selected fiber bundles to the datamanager.
 \li <b>Join Bundles</b>: Add new bundle to the datamanager that contains all fibers from the selected bundles.
 \li <b>Include Fiducials</b>: If checked, the specified transformation is also applied to the fiducials belonging to the selected fiber bundle and the fiducials are also copied.
 
 
 \section QmitkFiberfoxViewUserManualSignalGeneration Signal Generation
 
 To generate an artificial signal from the input fibers we follow the concepts recently presented by Panagiotaki et al. in a review and taxonomy of different compartment models:
 a flexible model combining multiple compartments is used to simulate the anisotropic diffusion inside (intra-axonal compartment) and between axons (inter-axonal compartment), isotropic diffusion outside of the axons (extra-axonal compartment 1)
 and the restricted diffusion in other cell types (extra-axonal compartment 2) weighted according to their respective volume fraction.
 
 A diffusion-weighted image is generated from the fibers by selecting the according fiber bundle in the "Fiber Bundle" combobox and clicking "Generate Image".
 If some other diffusion-weighted image is selected together with the fiber bundle, Fiberfox directly uses the parameters of the selected image (size, spacing, gradient directions, b-values) for the signal generation process.
 Additionally a binary image can be selected that defines the tissue area. Voxels outside of this mask will contain no signal, only noise and other effects induced by the acquisiton (ghosts etc.).
 If a save path is specified, the simualted image will be saved at this location. Eventually generated log files (e.g. recording the head motion) are also saved at this location. If not path is specified,
 the simualted image will only appear in the data manager and has to be saved manually. Logfiles are then saved in the system specific temp directory.
 
 If no fiber bundle but a diffusion-weighted image is selected, the specified artifacts are added to the selected image. In this mode, signal relaxation is disabled since multiple compartments are not available and the input image alrady contains relaxation effects. Also, introducing head motion is not possible since this qould require a contrast change in the weighted volumes.
 
 
 <b>Basic Image Settings:</b>
 \li <b>Image Dimensions</b>: Specifies actual image size (number of voxels in each dimension).
 \li <b>Image Spacing</b>: Specifies voxel size in mm. Beware that changing the voxel size also changes the signal strength, e.g. increasing the resolution from <em>2x2x2</em> mm to <em>1x1x1</em> mm decreases the signal obtained for each voxel by a factor 8.
 \li <b>Gradient Directions</b>: Number of gradients directions distributed equally over the half sphere. 10% baseline images are automatically added.
 \li <b>b-Value</b>: Diffusion weighting in s/mm². If an existing diffusion-weighted image is used to set the basic parameters, the b-value is defined by the gradient direction magnitudes of this image, which also enables the use of multiple b-values.
 
 
 <b>Advanced Image Settings (activate checkbox "Advanced Options"):</b>
 \li <b>Acquisition Type</b>: the default acquisition type is a single shot EPI, which acquires a complete k-space slice with one echo. Alternatively, a standard spin echo sequence can be chosen that uses a cartesian k-space sampling scheme and acquires one k-space line with one echo.
 \li <b>Signal Scale</b>: Additional scaling factor for the signal in each voxel. The default value of 100 results in a maximum signal amplitude of 800 for <em>2x2x2</em> mm voxels. Beware that changing this value without changing the noise variance results in a changed SNR. Adjustment of this value might be needed if the overall signal values are much too high or much too low (depends on a variety of factors like voxel size and relaxation times).
 \li <b>Number of Channels</b>: Specify the number of coil elements used for the acquisition. The coil elements are circularly arranged around the objects z-axis. Currently the coil distance to the currently imaged object slice in z-direction is not taken into account, so the coil basically seems to move with the currently imaged slice along the z-axis. The signals obtained from the individual coil elements are combined using a sum of squares approach. Beware that the simulation time scales linearly with the number of coils!
 \li <b>Coil Sensitivity</b>: Using multiple acquisition channels only makes sense if the coil elements have a non-constant sensitivity profile. At the moment linearly as well as exponantially decreasing coil sensitivities are implemented. Using a constant coil sensitivity, the signal received by each coil element is equal regardless of the distance to the coil. In case of a non-constant sensitivity profile the received signal intensities decrease with increasing distance from the coil element. Using a linear profile, about 50% of the signal originating from the slice center is received. In case of an exponential coil sensitivity, only about 32% of the signal originating from the slice center is received.
 \li <b>Echo Time <em>TE</em></b>: Time between the 90° excitation pulse and the first spin echo. Increasing this time results in a stronger <em>T2</em>-relaxation effect (<a href="http://en.wikipedia.org/wiki/Relaxation_%28NMR%29">Wikipedia</a>).
 \li <b>Repetition Time <em>TR</em></b>: Time between two 90° RF pulses. Important for T1 contrast (use short TE and TR for strong T1 weighting).
 \li <b>Dwell Time</b>: Time to read one line in k-space. Increasing this time results in a stronger <em>T2*</em> effect which causes an attenuation of the higher frequencies in phase direction (here along y-axis) which again results in a blurring effect of sharp edges perpendicular to the phase direction.
 \li <b><em>T<sub>inhom</sub></em> Relaxation (T2')</b>: Time constant specifying the signal decay due to magnetic field inhomogeneities (also called <em>T2'</em>). Together with the tissue specific relaxation time constant <em>T2</em> this defines the <em>T2*</em> decay constant: <em>T2*=(T2 T2')/(T2+T2')</em>
 \li <b>Fiber Radius (in µm)</b>: Used to calculate the volume fractions of the used compartments (fiber, water, etc.). If set to 0 (default) the fiber radius is set automatically so that the voxel containing the most fibers is filled completely. A realistic axon radius ranges from about 5 to 20 microns. Using the automatic estimation the resulting value might very well be much larger or smaller than this range.
 \li <b>Reverse Phase Encoding Direction</b>: Switch anterior-posterior and posterior-anterior phase encoding.
 \li <b>Simulate Signal Relaxation</b>: If checked, the relaxation induced signal decay is simulated, other wise the parameters <em>TE</em>, Line Readout Time, <em>T<sub>inhom</sub></em>, and <em>T2</em> are ignored.
 \li <b>Disable Partial Volume Effects</b>: If checked, the actual volume fractions of the single compartments are ignored. A voxel will either be filled by the intra axonal compartment completely or will contain no fiber at all.
 \li <b>Output Additional Images</b>: Output a double image for each compartment. The voxel values correspond to the volume fraction of the respective compartment.
 
 
 <b>Compartment Settings:</b>
 
 The group-boxes "Intra-axonal Compartment", "Inter-axonal Compartment" and "Extra-axonal Compartments" allow the specification which model to use and the corresponding model parameters. Currently the following models are implemented:
 \li <b>Stick</b>: The “stick” model describes diffusion in an idealized cylinder with zero radius. Parameter: Diffusivity <em>d</em>
 \li <b>Zeppelin</b>: Cylindrically symmetric diffusion tensor. Parameters: Parallel diffusivity <em>d<sub>||</sub></em> and perpendicular diffusivity  <em>d<sub>⊥</sub></em>
 \li <b>Tensor</b>: Full diffusion tensor. Parameters: Parallel diffusivity <em>d<sub>||</sub></em> and perpendicular diffusivity constants  <em>d<sub>⊥1</sub></em> and <em>d<sub>⊥2</sub></em>
 \li <b>Ball</b>: Isotropic compartment. Parameter: Diffusivity <em>d</em>
 \li <b>Astrosticks</b>: Consists of multiple stick models pointing in different directions. The single stick orientations can either be distributed equally over the sphere or are sampled randomly. The model represents signal coming from a type of glial cell called astrocytes, or populations of axons with arbitrary orientation. Parameters: randomization of the stick orientations and diffusivity of the sticks <em>d</em>.
 \li <b>Dot</b>: Isotropically restricted compartment. No parameter.
 \li <b>Prototype Signal</b>: EXPERIMENTAL FEATURE!!! The signal is not generated from a parametric model but a prototype signal is sampled from the selected diffusion-weighted image. Parameters: The number of prototype signals that are used for the signal generation (at each fiber position one is picked randomly) and the constraining diffusion parameters for a voxel signal to be included in the list. For a fiber signal one would for example probably select a high <em>FA</em> and for a CSF voxel a low <em>FA</em>.
 
 For a detailed description of the individual models, please refer to Panagiotaki <em>et al.</em> "Compartment models of the diffusion MR signal in brain white matter: A taxonomy and comparison".
 
 Additionally to the model parameters, each compartment has its own <em>T1</em> and <em>T2</em> signal relaxation constants (in <em>ms</em>). This constants are not relevant if the prototype signal model is used, since in this case signal relaxation is disabled.
 Furthermore, it is possible to specify a volume fraction map for each compartment:
 \li The volume fraction maps for compartment 1 and 2 (fiber compartments) are optional. If they are not specified, the corresponding volume fractions are directly determined from the fiber bundle.
 Additionally, it is assumed that in this case all volume fraction maps of the non-fiber compartments contain values relative to the remaining non-fiber volume, not absolute fractions of the complete voxel volume.
 This ensures that the automatically determined fiber volumes and the map-defined non-fiber volumes sum up to 1 in each voxel.
 \li If one non-fiber compartment is used but no corresponding volume fraction map is specified, the corresponding volume is automatically set to the remaining volume (voxel volume - fiber volume).
 \li If four compartments are used, at least one of the extra axonal compartment volume fraction maps has to be specified. The second one can be automatically determined from the respective other (1-f). If this is the case, the non-fiber volume information is again regarded as relative to the available non-fiber volume.
 
 
 <b>Noise and Artifacts:</b>
 \li <b>Noise</b>: Add Rician or Chi-Square distributed noise with the specified variance to the signal.
 \li <b>Spikes</b>: Add signal spikes to the k-space signal resulting in stripe artifacts across the corresponding image slice.
 \li <b>Aliasing</b>: Aliasing artifacts occur if the FOV in phase direction is smaller than the imaged object. The parameter defines the percentage by which the FOV is shrunk.
 \li <b>N/2 Ghosts</b>: Specify the offset between successive lines in k-space. This offset causes ghost images in distance N/2 in phase direction due to the alternating EPI readout directions.
 \li <b>Distortions</b>: Simulate distortions due to magnetic field inhomogeneities. This is achieved by adding an additional phase during the readout process. The input is a frequency map specifying the inhomogeneities. The "Fieldmap Generator" view provides an interface to generate simple artificial frequency maps. To egnerate realistic distortions for an in vivo like dataset we recommend using a frequency map acquired during a real MR scan or one estimated with tools such as FSL TOPUP.
 \li <b>Motion Artifacts</b>: To simulate motion artifacts, the fiber configuration is moved between the signal simulation of the individual gradient volumes. The motion can be performed randomly, where the parameters are used to define the +/- maximum of the corresponding motion, or linearly, where the parameters define the maximum rotation/translation around/along the corresponding axis at the and of the simulated acquisition.
 \li <b>Eddy Currents</b>: Eddy current induced magnetic field gradient (in mT/m) at the beginning of the k-space readout. A spatially linear eddy current profile in the direction of the respective diffusion-weighting gradient is used. The eddy current induced gradient decays with a time constant &tau;=70ms.
 \li <b>Gibbs Ringing</b>: Ringing artifacts occurring on edges in the image due to the frequency low-pass filtering caused by the limited size of the k-space.
 
 \imageMacro{FiberfoxExamples.png, "Fig. 3: Examples of artificial crossing (a\,b)\, fanning (c\,d)\, highly curved (e\,f)\, kissing (g\,h) and twisting (i\,j) fibers as well as of the corresponding tensor images generated with Fiberfox.",4}
 
 \imageMacro{FiberfoxWholebrain.png, "Fig. 4: Realistic simulation of a whole brain dataset with multiple artifacts.",4}
 
 \section QmitkFiberfoxViewUserManualKnownIssues Known Issues
 
 \li If a scaling factor is applied to the selcted fiber bundle, the corresponding fiducials are not scaled accordingly.
 \li In some cases the automatic update of the selected fiber bundle is not triggered even if "Real Time Fibers" is checked, e.g. if a fiducial is deleted. If this happens on can always force an update by pressing the "Generate Fibers" button.
 
 If any other issues or feature requests arises during the use of Fiberfox, please don't hesitate to send us an e-mail or directly report the issue in our bugtracker: https://phabricator.mitk.org/maniphest/
 \section QmitkFiberfoxViewUserManualReferences References
 
 [1] Neher, P.F., Laun, F.B., Stieltjes, B., Maier-Hein, K.H., 2014. Fiberfox: facilitating the creation of realistic white matter software phantoms. Magn Reson Med 72, 1460–1470. doi:10.1002/mrm.25045
 
 [2] Neher, P.F., Laun, F.Neher, P.F., Stieltjes, B., Laun, F.B., Meinzer, H.-P., Fritzsche, K.H., 2013. Fiberfox: A novel tool to generate software phantoms of complex fiber geometries, in: Proceedings of International Society of Magnetic Resonance in Medicine.
 
 [3] Neher, P.F., Stieltjes, B., Laun, F.B., Meinzer, H.-P., Fritzsche, K.H., 2013. Fiberfox: A novel tool to generate software phantoms of complex fiber geometries, in: Proceedings of International Society of Magnetic Resonance in Medicine.
 
 [4] Hering, J., Neher, P.F., Meinzer, H.-P., Maier-Hein, K.H., 2014. Construction of ground-truth data for head motion correction in diffusion MRI, in: Proceedings of International Society of Magnetic Resonance in Medicine.
 
 [5] Maier-Hein, Klaus, Neher, Peter, Houde, Jean-Christophe, Caruyer, Emmanuel, Daducci, Alessandro, Dyrby, Tim, … Descoteaux, Maxime. (2015). Tractography Challenge ISMRM 2015 Data [Data set]. Zenodo. http://doi.org/10.5281/zenodo.572345
 
 [6] Maier-Hein, Klaus, Neher, Peter, Houde, Jean-Christophe, Caruyer, Emmanuel, Daducci, Alessandro, Dyrby, Tim, … Descoteaux, Maxime. (2017). Tractography Challenge ISMRM 2015 High-resolution Data [Data set]. Zenodo. http://doi.org/10.5281/zenodo.579933
 
 */
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp
index eb8fe468e4..239c0e8c75 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp
@@ -1,51 +1,49 @@
 /*===================================================================
 
 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 "QmitkDIAppSyntheticDataGenerationPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppSyntheticDataGenerationPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
-    /////////////////////////////////////////////////////
-    // all di-app perspectives should have the following:
-    /////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////
+  // all di-app perspectives should have the following:
+  /////////////////////////////////////////////////////
 
-    QString editorArea = layout->GetEditorArea();
+  QString editorArea = layout->GetEditorArea();
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
-    layout->AddStandaloneView("org.mitk.views.datamanager",
-                              false, berry::IPageLayout::LEFT, 0.3f, editorArea);
+  layout->AddStandaloneView("org.mitk.views.datamanager",
+                            false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
-    layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
-                              false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
+  layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
+                            false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
-    berry::IFolderLayout::Pointer left =
-            layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
-                                 berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
+  berry::IFolderLayout::Pointer left =
+      layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
+                           berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
-                                         berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
+                                       berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
-    /////////////////////////////////////////////
-    // here goes the perspective specific stuff
-    /////////////////////////////////////////////
-
-    left->AddView("org.mitk.views.fiberfoxview");
-    left->AddView("org.mitk.views.fieldmapgenerator");
-    left->AddView("org.mitk.views.segmentation");
+  /////////////////////////////////////////////
+  // here goes the perspective specific stuff
+  /////////////////////////////////////////////
 
+  left->AddView("org.mitk.views.fiberfoxview");
+  left->AddView("org.mitk.views.fieldmapgenerator");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFiberfoxViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFiberfoxViewControls.ui
index 18726f9332..87d94a0607 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFiberfoxViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFiberfoxViewControls.ui
@@ -1,3448 +1,3567 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkFiberfoxViewControls</class>
  <widget class="QWidget" name="QmitkFiberfoxViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>524</width>
-    <height>2652</height>
+    <width>463</width>
+    <height>875</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="3" column="0">
     <widget class="QCommandLinkButton" name="m_LoadParametersButton">
      <property name="text">
       <string>Load Parameters</string>
      </property>
      <property name="icon">
       <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
        <normaloff>:/QmitkDiffusionImaging/general_icons/upload.ico</normaloff>:/QmitkDiffusionImaging/general_icons/upload.ico</iconset>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>1</number>
+   <item row="2" column="0">
+    <widget class="QCommandLinkButton" name="m_SaveParametersButton">
+     <property name="text">
+      <string>Save Parameters</string>
      </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Fiber Definition</string>
+     <property name="icon">
+      <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+       <normaloff>:/QmitkDiffusionImaging/general_icons/download.ico</normaloff>:/QmitkDiffusionImaging/general_icons/download.ico</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QToolBox" name="toolBox">
+     <widget class="QWidget" name="toolBoxPage2" native="true">
+      <attribute name="label">
+       <string>Signal Generation</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_8">
-       <item row="7" column="0">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <property name="verticalSpacing">
+        <number>25</number>
+       </property>
        <item row="0" column="0">
-        <widget class="QLabel" name="m_FiberGenMessage">
-         <property name="styleSheet">
-          <string notr="true">color: rgb(255, 0, 0);</string>
-         </property>
-         <property name="text">
-          <string>Please select an image or an existing fiber bundle to draw the fiber fiducials. If you can't provide a suitable image, generate one using the &quot;Signal Generation&quot; tab.</string>
-         </property>
-         <property name="textFormat">
-          <enum>Qt::AutoText</enum>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignJustify|Qt::AlignVCenter</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
+        <widget class="QFrame" name="frame_9">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
          </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QGroupBox" name="groupBox_7">
-         <property name="title">
-          <string>Fiducial Options</string>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
          </property>
-         <layout class="QGridLayout" name="gridLayout_16">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="m_ConstantRadiusBox">
-            <property name="toolTip">
-             <string>All fiducials are treated as circles with the same radius as the first fiducial. </string>
-            </property>
-            <property name="text">
-             <string>Use Constant Fiducial Radius</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
+         <layout class="QGridLayout" name="gridLayout_32">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
           <item row="1" column="0">
-           <widget class="QCommandLinkButton" name="m_AlignOnGrid">
+           <widget class="QCommandLinkButton" name="m_GenerateImageButton">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="toolTip">
-             <string>Align selected fiducials with voxel grid. Shifts selected fiducials to nearest voxel center.</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Start DWI generation from selected fiber bundle.&lt;/p&gt;&lt;p&gt;If no fiber bundle but an existing diffusion weighted image is selected, the enabled artifacts are added to this image.&lt;/p&gt;&lt;p&gt;If neither a fiber bundle nor a diffusion weighted image is selected, a grayscale image containing a simple gradient is generated.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>Align With Grid</string>
+             <string>Start Simulation</string>
             </property>
             <property name="icon">
              <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
               <normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</iconset>
             </property>
            </widget>
           </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="6" column="0" colspan="2">
-        <widget class="QGroupBox" name="groupBox_4">
-         <property name="title">
-          <string>Operations</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_11">
-          <item row="5" column="0">
-           <widget class="QCommandLinkButton" name="m_JoinBundlesButton">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Join Bundles</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-              <normaloff>:/QmitkDiffusionImaging/general_icons/plus.ico</normaloff>:/QmitkDiffusionImaging/general_icons/plus.ico</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QFrame" name="frame_4">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
+          <item row="0" column="0">
+           <widget class="QGroupBox" name="groupBox_2">
+            <property name="title">
+             <string>Input Data</string>
             </property>
-            <layout class="QGridLayout" name="gridLayout_12">
+            <layout class="QGridLayout" name="gridLayout_10">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="1" column="2">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_18">
-               <property name="toolTip">
-                <string/>
-               </property>
-               <property name="statusTip">
-                <string/>
-               </property>
-               <property name="whatsThis">
-                <string/>
-               </property>
-               <property name="text">
-                <string>Y</string>
+             <item row="4" column="2">
+              <widget class="QFrame" name="frame_6">
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
                </property>
-               <property name="wordWrap">
-                <bool>false</bool>
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
                </property>
+               <layout class="QGridLayout" name="gridLayout_20">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>0</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <property name="spacing">
+                 <number>0</number>
+                </property>
+                <item row="0" column="0">
+                 <widget class="QLineEdit" name="m_SavePathEdit">
+                  <property name="text">
+                   <string>-</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QToolButton" name="m_OutputPathButton">
+                  <property name="text">
+                   <string>...</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
               </widget>
              </item>
-             <item row="2" column="1">
-              <widget class="QDoubleSpinBox" name="m_XrotBox">
+             <item row="2" column="2">
+              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_MaskComboBox">
                <property name="toolTip">
-                <string>Rotation angle (in degree) around x-axis.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>-360.000000000000000</double>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a binary image to define the area of signal generation. Outside of the mask image only noise will be actively generated.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
-               <property name="maximum">
-                <double>360.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
+               <property name="sizeAdjustPolicy">
+                <enum>QComboBox::AdjustToMinimumContentsLength</enum>
                </property>
               </widget>
              </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_22">
+             <item row="0" column="0" rowspan="2" colspan="2">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_16">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
-                <string>Axis:</string>
+                <string>Fiber Bundle:</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="2" column="2">
-              <widget class="QDoubleSpinBox" name="m_YrotBox">
-               <property name="toolTip">
-                <string>Rotation angle (in degree) around y-axis.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>-360.000000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>360.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_21">
+             <item row="4" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_10">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
-                <string>Translation:</string>
+                <string>Save path:</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="3" column="3">
-              <widget class="QDoubleSpinBox" name="m_ZtransBox">
-               <property name="toolTip">
-                <string>Translation (in mm) in direction of the z-axis.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>-1000.000000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>1000.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="2">
-              <widget class="QDoubleSpinBox" name="m_YtransBox">
-               <property name="toolTip">
-                <string>Translation (in mm) in direction of the y-axis.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>-1000.000000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>1000.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_17">
+             <item row="2" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_3">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
-                <string>X</string>
+                <string>Tissue Mask:</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_20">
+             <item row="1" column="2">
+              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_FiberBundleComboBox">
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a fiber bundle to generate the white matter signal from. You can either use the fiber definition tab to manually define an input fiber bundle or you can also use any existing bundle, e.g. yielded by a tractography algorithm.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="sizeAdjustPolicy">
+                <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_11">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
-                <string>Rotation:</string>
+                <string>Template Image:</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="1" column="3">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_19">
-               <property name="toolTip">
-                <string/>
-               </property>
-               <property name="statusTip">
-                <string/>
-               </property>
-               <property name="whatsThis">
-                <string/>
-               </property>
-               <property name="text">
-                <string>Z</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="3">
-              <widget class="QDoubleSpinBox" name="m_ZrotBox">
-               <property name="toolTip">
-                <string>Rotation angle (in degree) around z-axis.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>-360.000000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>360.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QDoubleSpinBox" name="m_XtransBox">
-               <property name="toolTip">
-                <string>Translation (in mm) in direction of the x-axis.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>-1000.000000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>1000.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_24">
-               <property name="toolTip">
-                <string/>
-               </property>
-               <property name="statusTip">
-                <string/>
-               </property>
-               <property name="whatsThis">
-                <string/>
-               </property>
-               <property name="text">
-                <string>Scaling:</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="1">
-              <widget class="QDoubleSpinBox" name="m_XscaleBox">
-               <property name="toolTip">
-                <string>Scaling factor for selected fiber bundle along the x-axis.</string>
-               </property>
-               <property name="minimum">
-                <double>0.010000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>10.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.010000000000000</double>
-               </property>
-               <property name="value">
-                <double>1.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="2">
-              <widget class="QDoubleSpinBox" name="m_YscaleBox">
-               <property name="toolTip">
-                <string>Scaling factor for selected fiber bundle along the y-axis.</string>
-               </property>
-               <property name="minimum">
-                <double>0.010000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>10.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.010000000000000</double>
-               </property>
-               <property name="value">
-                <double>1.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="3">
-              <widget class="QDoubleSpinBox" name="m_ZscaleBox">
+             <item row="3" column="2">
+              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_TemplateComboBox">
                <property name="toolTip">
-                <string>Scaling factor for selected fiber bundle along the z-axis.</string>
-               </property>
-               <property name="minimum">
-                <double>0.010000000000000</double>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The parameters for the simulation (e.g. spacing, size, diffuison-weighted gradients, b-value) are adopted from this image.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
-               <property name="maximum">
-                <double>10.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.010000000000000</double>
-               </property>
-               <property name="value">
-                <double>1.000000000000000</double>
+               <property name="sizeAdjustPolicy">
+                <enum>QComboBox::AdjustToMinimumContentsLength</enum>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QCommandLinkButton" name="m_CopyBundlesButton">
+          <item row="2" column="0">
+           <widget class="QCommandLinkButton" name="m_AbortSimulationButton">
             <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Copy Bundles</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-              <normaloff>:/QmitkDiffusionImaging/general_icons/copy2.ico</normaloff>:/QmitkDiffusionImaging/general_icons/copy2.ico</iconset>
+             <bool>true</bool>
             </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QCommandLinkButton" name="m_TransformBundlesButton">
-            <property name="enabled">
-             <bool>false</bool>
+            <property name="toolTip">
+             <string>Stop current simulation.</string>
             </property>
             <property name="text">
-             <string>Transform Selection</string>
+             <string>Abort Simulation</string>
             </property>
             <property name="icon">
              <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-              <normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</iconset>
+              <normaloff>:/QmitkDiffusionImaging/general_icons/abort.ico</normaloff>:/QmitkDiffusionImaging/general_icons/abort.ico</iconset>
             </property>
            </widget>
           </item>
-          <item row="6" column="0">
-           <widget class="QCheckBox" name="m_IncludeFiducials">
-            <property name="toolTip">
-             <string>If checked, the fiducials belonging to the modified bundle are also modified.</string>
-            </property>
-            <property name="text">
-             <string>Include Fiducials</string>
-            </property>
-            <property name="checked">
+          <item row="3" column="0">
+           <widget class="QTextEdit" name="m_SimulationStatusText">
+            <property name="font">
+             <font>
+              <family>Courier</family>
+              <pointsize>7</pointsize>
+             </font>
+            </property>
+            <property name="readOnly">
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QGroupBox" name="groupBox_8">
+       <item row="9" column="0">
+        <widget class="QGroupBox" name="groupBox_6">
          <property name="title">
-          <string>Fiber Options</string>
+          <string>Extra-axonal Compartments</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_15">
-          <item row="2" column="0">
-           <widget class="QFrame" name="frame_5">
+         <layout class="QGridLayout" name="gridLayout_14">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="18" column="0">
+           <widget class="QFrame" name="m_Comp4FractionFrame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_9">
+            <layout class="QGridLayout" name="gridLayout_30">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="2" column="0">
-              <widget class="QFrame" name="m_AdvancedFiberOptionsFrame">
-               <property name="frameShape">
-                <enum>QFrame::NoFrame</enum>
+             <item row="0" column="0">
+              <widget class="QLabel" name="m_NoiseLabel_9">
+               <property name="text">
+                <string>Volume Fraction:</string>
                </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp4VolumeFraction">
+               <property name="toolTip">
+                <string/>
                </property>
-               <layout class="QGridLayout" name="gridLayout_21">
-                <property name="leftMargin">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="rightMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>0</number>
-                </property>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_5">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>Tension:</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_8">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>Fiber Sampling:</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QDoubleSpinBox" name="m_TensionBox">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="decimals">
-                   <number>3</number>
-                  </property>
-                  <property name="minimum">
-                   <double>-1.000000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>1.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.100000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>0.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="1">
-                 <widget class="QDoubleSpinBox" name="m_BiasBox">
-                  <property name="decimals">
-                   <number>3</number>
-                  </property>
-                  <property name="minimum">
-                   <double>-1.000000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>1.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.100000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>0.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_7">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>Bias:</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_6">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>Continuity:</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QDoubleSpinBox" name="m_ContinuityBox">
-                  <property name="decimals">
-                   <number>3</number>
-                  </property>
-                  <property name="minimum">
-                   <double>-1.000000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>1.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.100000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>0.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QDoubleSpinBox" name="m_FiberSamplingBox">
-                  <property name="toolTip">
-                   <string>Distance of fiber sampling points (in mm)</string>
-                  </property>
-                  <property name="decimals">
-                   <number>1</number>
-                  </property>
-                  <property name="minimum">
-                   <double>0.100000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.100000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>1.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QFrame" name="frame_2">
-               <property name="frameShape">
-                <enum>QFrame::NoFrame</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
-               <layout class="QGridLayout" name="gridLayout_25">
-                <property name="leftMargin">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="rightMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>0</number>
-                </property>
-                <property name="verticalSpacing">
-                 <number>6</number>
-                </property>
-                <item row="0" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_4">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>#Fibers:</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QSpinBox" name="m_FiberDensityBox">
-                  <property name="toolTip">
-                   <string>Specify number of fibers to generate for the selected bundle.</string>
-                  </property>
-                  <property name="minimum">
-                   <number>1</number>
-                  </property>
-                  <property name="maximum">
-                   <number>1000000</number>
-                  </property>
-                  <property name="singleStep">
-                   <number>100</number>
-                  </property>
-                  <property name="value">
-                   <number>100</number>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QCommandLinkButton" name="m_GenerateFibersButton">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Generate Fibers</string>
+          <item row="6" column="0">
+           <widget class="QComboBox" name="m_Compartment3Box">
+            <property name="toolTip">
+             <string>Select signal model for extra-axonal compartment.</string>
             </property>
-            <property name="icon">
-             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-              <normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</iconset>
+            <item>
+             <property name="text">
+              <string>Ball Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Astrosticks Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Dot Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Prototype Signal</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QmitkAstrosticksModelParametersWidget" name="m_AstrosticksWidget1" native="true"/>
+          </item>
+          <item row="10" column="0">
+           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget3" native="true"/>
+          </item>
+          <item row="16" column="0">
+           <widget class="QmitkDotModelParametersWidget" name="m_DotWidget2" native="true"/>
+          </item>
+          <item row="9" column="0">
+           <widget class="QmitkDotModelParametersWidget" name="m_DotWidget1" native="true"/>
+          </item>
+          <item row="12" column="0">
+           <widget class="Line" name="line_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QFrame" name="frame_3">
+          <item row="11" column="0">
+           <widget class="QFrame" name="m_Comp3FractionFrame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_5">
+            <layout class="QGridLayout" name="gridLayout_29">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="0" column="1">
-              <widget class="QComboBox" name="m_DistributionBox">
-               <property name="toolTip">
-                <string>Select fiber distribution inside of the fiducials.</string>
+             <item row="0" column="0">
+              <widget class="QLabel" name="m_NoiseLabel_8">
+               <property name="text">
+                <string>Volume Fraction:</string>
                </property>
-               <item>
-                <property name="text">
-                 <string>Uniform</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Gaussian</string>
-                </property>
-               </item>
               </widget>
              </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_9">
-               <property name="toolTip">
-                <string/>
-               </property>
-               <property name="statusTip">
-                <string/>
-               </property>
-               <property name="whatsThis">
-                <string/>
-               </property>
-               <property name="text">
-                <string>Fiber Distribution:</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QDoubleSpinBox" name="m_VarianceBox">
+             <item row="0" column="1">
+              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp3VolumeFraction">
                <property name="toolTip">
-                <string>Variance of the gaussian</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>0.001000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>10.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.010000000000000</double>
-               </property>
-               <property name="value">
-                <double>0.100000000000000</double>
+                <string>Optional! If no volume fraction map for this compartment is set, the corresponding volume fractions are calculated from the input fibers.</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
+          <item row="14" column="0">
+           <widget class="QmitkBallModelParametersWidget" name="m_BallWidget2" native="true"/>
+          </item>
+          <item row="7" column="0">
+           <widget class="QmitkBallModelParametersWidget" name="m_BallWidget1" native="true"/>
+          </item>
+          <item row="15" column="0">
+           <widget class="QmitkAstrosticksModelParametersWidget" name="m_AstrosticksWidget2" native="true"/>
+          </item>
+          <item row="13" column="0">
+           <widget class="QComboBox" name="m_Compartment4Box">
+            <property name="toolTip">
+             <string>Select signal model for extra-axonal compartment.</string>
+            </property>
+            <item>
+             <property name="text">
+              <string>--</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Ball Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Astrosticks Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Dot Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Prototype Signal</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="17" column="0">
+           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget4" native="true"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QGroupBox" name="m_IntraAxonalGroupBox">
+         <property name="title">
+          <string>Intra-axonal Compartment</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_13">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="3" column="0">
+           <widget class="QmitkTensorModelParametersWidget" name="m_TensorWidget1" native="true"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QmitkStickModelParametersWidget" name="m_StickWidget1" native="true"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget1" native="true"/>
+          </item>
           <item row="0" column="0">
-           <widget class="QFrame" name="frame_8">
+           <widget class="QComboBox" name="m_Compartment1Box">
+            <property name="toolTip">
+             <string>Select signal model for intra-axonal compartment.</string>
+            </property>
+            <item>
+             <property name="text">
+              <string>Stick Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Zeppelin Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Tensor Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Prototype Signal</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QmitkZeppelinModelParametersWidget" name="m_ZeppelinWidget1" native="true"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QFrame" name="m_Comp1FractionFrame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_22">
+            <layout class="QGridLayout" name="gridLayout_26">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item row="0" column="0">
-              <widget class="QCheckBox" name="m_RealTimeFibers">
-               <property name="toolTip">
-                <string>Disable to only generate fibers if &quot;Generate Fibers&quot; button is pressed.</string>
-               </property>
+              <widget class="QLabel" name="m_NoiseLabel_6">
                <property name="text">
-                <string>Real Time Fibers</string>
-               </property>
-               <property name="checked">
-                <bool>true</bool>
+                <string>Volume Fraction:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="QCheckBox" name="m_AdvancedOptionsBox">
+              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp1VolumeFraction">
                <property name="toolTip">
-                <string>Disable to only generate fibers if &quot;Generate Fibers&quot; button is pressed.</string>
-               </property>
-               <property name="text">
-                <string>Advanced Options</string>
-               </property>
-               <property name="checked">
-                <bool>false</bool>
+                <string>Optional! If no volume fraction map for this compartment is set, the corresponding volume fractions are calculated from the input fibers.</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QFrame" name="frame">
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+       <item row="6" column="0">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Image Settings</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_3">
+         <layout class="QGridLayout" name="gridLayout">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QPushButton" name="m_CircleButton">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Draw elliptical fiducial.</string>
-            </property>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="m_AdvancedOptionsBox_2">
             <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-              <normaloff>:/QmitkDiffusionImaging/circle.png</normaloff>:/QmitkDiffusionImaging/circle.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="checkable">
-             <bool>false</bool>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
+             <string>Advanced Options</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="m_FlipButton">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Flip fiber waypoints of selcted fiducial around one axis.</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-              <normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="checkable">
-             <bool>false</bool>
+          <item row="5" column="0">
+           <widget class="QFrame" name="m_TensorsToDWIFrame">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
             </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_2">
-      <attribute name="title">
-       <string>Signal Generation</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_4">
-       <item row="10" column="0">
-        <widget class="QGroupBox" name="groupBox_6">
-         <property name="title">
-          <string>Extra-axonal Compartments</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_14">
-          <item row="18" column="0">
-           <widget class="QFrame" name="m_Comp4FractionFrame">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_30">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_NoiseLabel_9">
-               <property name="text">
-                <string>Volume Fraction:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp4VolumeFraction">
-               <property name="toolTip">
-                <string/>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QComboBox" name="m_Compartment3Box">
-            <property name="toolTip">
-             <string>Select signal model for extra-axonal compartment.</string>
-            </property>
-            <item>
-             <property name="text">
-              <string>Ball Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Astrosticks Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Dot Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Prototype Signal</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="8" column="0">
-           <widget class="QmitkAstrosticksModelParametersWidget" name="m_AstrosticksWidget1" native="true"/>
-          </item>
-          <item row="10" column="0">
-           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget3" native="true"/>
-          </item>
-          <item row="16" column="0">
-           <widget class="QmitkDotModelParametersWidget" name="m_DotWidget2" native="true"/>
-          </item>
-          <item row="9" column="0">
-           <widget class="QmitkDotModelParametersWidget" name="m_DotWidget1" native="true"/>
-          </item>
-          <item row="12" column="0">
-           <widget class="Line" name="line_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="11" column="0">
-           <widget class="QFrame" name="m_Comp3FractionFrame">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_29">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_NoiseLabel_8">
-               <property name="text">
-                <string>Volume Fraction:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp3VolumeFraction">
-               <property name="toolTip">
-                <string>Optional! If no volume fraction map for this compartment is set, the corresponding volume fractions are calculated from the input fibers.</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="14" column="0">
-           <widget class="QmitkBallModelParametersWidget" name="m_BallWidget2" native="true"/>
-          </item>
-          <item row="7" column="0">
-           <widget class="QmitkBallModelParametersWidget" name="m_BallWidget1" native="true"/>
-          </item>
-          <item row="15" column="0">
-           <widget class="QmitkAstrosticksModelParametersWidget" name="m_AstrosticksWidget2" native="true"/>
-          </item>
-          <item row="13" column="0">
-           <widget class="QComboBox" name="m_Compartment4Box">
-            <property name="toolTip">
-             <string>Select signal model for extra-axonal compartment.</string>
-            </property>
-            <item>
-             <property name="text">
-              <string>--</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Ball Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Astrosticks Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Dot Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Prototype Signal</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="17" column="0">
-           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget4" native="true"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="13" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="7" column="0">
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>Image Settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="6" column="0">
-           <widget class="QCheckBox" name="m_AdvancedOptionsBox_2">
-            <property name="text">
-             <string>Advanced Options</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="QFrame" name="m_TensorsToDWIFrame">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_24">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
               <number>6</number>
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="m_TensorsToDWINumDirsLabel">
                <property name="text">
                 <string>Gradient Directions:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QSpinBox" name="m_NumGradientsBox">
                <property name="toolTip">
                 <string>Number of gradient directions distributed over the half sphere.</string>
                </property>
                <property name="minimum">
                 <number>0</number>
                </property>
                <property name="maximum">
                 <number>10000</number>
                </property>
                <property name="singleStep">
                 <number>1</number>
                </property>
                <property name="value">
                 <number>30</number>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;b-Value&lt;span style=&quot; font-style:italic;&quot;&gt; [s/mm&lt;/span&gt;&lt;span style=&quot; font-style:italic; vertical-align:super;&quot;&gt;2&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;]&lt;/span&gt;:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="QSpinBox" name="m_BvalueBox">
                <property name="toolTip">
                 <string>b-value in s/mm²</string>
                </property>
                <property name="minimum">
                 <number>0</number>
                </property>
                <property name="maximum">
                 <number>10000</number>
                </property>
                <property name="singleStep">
                 <number>100</number>
                </property>
                <property name="value">
                 <number>1000</number>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="m_GeometryMessage">
             <property name="styleSheet">
              <string notr="true">color: rgb(255, 0, 0);</string>
             </property>
             <property name="text">
              <string>Using  geometry of selected image!</string>
             </property>
            </widget>
           </item>
           <item row="4" column="0">
            <widget class="QLabel" name="m_DiffusionPropsMessage">
             <property name="styleSheet">
              <string notr="true">color: rgb(255, 0, 0);</string>
             </property>
             <property name="text">
              <string>Using  gradients of selected DWI!</string>
             </property>
            </widget>
           </item>
           <item row="7" column="0">
            <widget class="QFrame" name="m_AdvancedSignalOptionsFrame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_23">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="horizontalSpacing">
               <number>6</number>
              </property>
              <item row="2" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel_13">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Channels:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="6" column="1">
               <widget class="QSpinBox" name="m_TRbox">
                <property name="toolTip">
                 <string>TR in milliseconds</string>
                </property>
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>999999999</number>
                </property>
                <property name="singleStep">
                 <number>1</number>
                </property>
                <property name="value">
                 <number>4000</number>
                </property>
               </widget>
              </item>
              <item row="12" column="0">
               <widget class="QCheckBox" name="m_ReversePhaseBox">
                <property name="toolTip">
                 <string>Output one image per compartment containing the corresponding volume fractions per voxel.</string>
                </property>
                <property name="text">
                 <string>Reverse Phase Encoding Direction</string>
                </property>
                <property name="checked">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QLabel" name="m_TensorsToDWINumDirsLabel_5">
                <property name="text">
                 <string>Signal Scale:</string>
                </property>
               </widget>
              </item>
              <item row="7" column="1">
               <widget class="QDoubleSpinBox" name="m_LineReadoutTimeBox">
                <property name="toolTip">
                 <string>Dwell time (time to read one line in k-space) in ms.</string>
                </property>
                <property name="maximum">
                 <double>100.000000000000000</double>
                </property>
                <property name="singleStep">
                 <double>0.100000000000000</double>
                </property>
                <property name="value">
                 <double>1.000000000000000</double>
                </property>
               </widget>
              </item>
              <item row="4" column="1">
               <widget class="QSpinBox" name="m_TEbox">
                <property name="toolTip">
                 <string>TE in milliseconds</string>
                </property>
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>999999999</number>
                </property>
                <property name="singleStep">
                 <number>1</number>
                </property>
                <property name="value">
                 <number>100</number>
                </property>
               </widget>
              </item>
              <item row="11" column="0">
               <widget class="QLabel" name="m_TensorsToDWINumDirsLabel_4">
                <property name="text">
                 <string>Fiber Radius:</string>
                </property>
               </widget>
              </item>
              <item row="8" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel_32">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>Partial Fourier:</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="14" column="0">
               <widget class="QCheckBox" name="m_EnforcePureFiberVoxelsBox">
                <property name="toolTip">
                 <string>Disable partial volume. Treat voxel content as fiber-only if at least one fiber is present.</string>
                </property>
                <property name="text">
                 <string>Disable Partial Volume Effects</string>
                </property>
                <property name="checked">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="3" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel_34">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Coil Sensitivity:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="8" column="1">
               <widget class="QDoubleSpinBox" name="m_PartialFourier">
                <property name="toolTip">
                 <string>Partial fourier factor (0.5-1)</string>
                </property>
                <property name="decimals">
                 <number>3</number>
                </property>
                <property name="minimum">
                 <double>0.500000000000000</double>
                </property>
                <property name="maximum">
                 <double>1.000000000000000</double>
                </property>
                <property name="singleStep">
                 <double>0.100000000000000</double>
                </property>
                <property name="value">
                 <double>1.000000000000000</double>
                </property>
               </widget>
              </item>
              <item row="15" column="0">
               <widget class="QCheckBox" name="m_VolumeFractionsBox">
                <property name="toolTip">
                 <string>Output phase image and volume fraction maps.</string>
                </property>
                <property name="text">
                 <string>Output Additional Images</string>
                </property>
                <property name="checked">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="9" column="1">
               <widget class="QSpinBox" name="m_T2starBox">
                <property name="toolTip">
                 <string>Relaxation time due to magnetic field inhomogeneities (T2', in milliseconds).</string>
                </property>
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>10000</number>
                </property>
                <property name="singleStep">
                 <number>1</number>
                </property>
                <property name="value">
                 <number>50</number>
                </property>
               </widget>
              </item>
              <item row="6" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel_14">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Repetition Time &lt;span style=&quot; font-style:italic;&quot;&gt;TR&lt;/span&gt;: &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="3" column="1">
               <widget class="QComboBox" name="m_CoilSensBox">
                <item>
                 <property name="text">
                  <string>Constant</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Linear</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Exponential</string>
                 </property>
                </item>
               </widget>
              </item>
              <item row="7" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel_15">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>Dwell Time:</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="9" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel_12">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;T&lt;/span&gt;&lt;span style=&quot; font-style:italic; vertical-align:sub;&quot;&gt;inhom&lt;/span&gt; Relaxation: &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="13" column="0">
               <widget class="QCheckBox" name="m_RelaxationBox">
                <property name="toolTip">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;TE&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;T&lt;/span&gt;&lt;span style=&quot; font-style:italic; vertical-align:sub;&quot;&gt;inhom&lt;/span&gt; and &lt;span style=&quot; font-style:italic;&quot;&gt;T2&lt;/span&gt; will have no effect if unchecked.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="text">
                 <string>Simulate Signal Relaxation</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="4" column="0">
               <widget class="QLabel" name="m_TensorsToDWIBValueLabel_33">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Echo Time &lt;span style=&quot; font-style:italic;&quot;&gt;TE&lt;/span&gt;:  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="QSpinBox" name="m_SignalScaleBox">
                <property name="toolTip">
                 <string>TE in milliseconds</string>
                </property>
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>10000</number>
                </property>
                <property name="singleStep">
                 <number>1</number>
                </property>
                <property name="value">
                 <number>100</number>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
               <widget class="QSpinBox" name="m_NumCoilsBox">
                <property name="toolTip">
                 <string>Number of coil elements used for the acquisiton.</string>
                </property>
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>128</number>
                </property>
                <property name="singleStep">
                 <number>1</number>
                </property>
                <property name="value">
                 <number>1</number>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
               <widget class="QLabel" name="m_TensorsToDWINumDirsLabel_6">
                <property name="text">
                 <string>Acquisition Type:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QComboBox" name="m_AcquisitionTypeBox">
                <item>
                 <property name="text">
                  <string>Single Shot EPI</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Spin Echo</string>
                 </property>
                </item>
               </widget>
              </item>
              <item row="11" column="1">
               <widget class="QDoubleSpinBox" name="m_FiberRadius">
                <property name="toolTip">
                 <string>Fiber radius used to calculate volume fractions (in µm). Set to 0 for automatic radius estimation.</string>
                </property>
                <property name="maximum">
                 <double>9999.000000000000000</double>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QFrame" name="m_GeometryFrame">
+          <item row="3" column="0">
+           <widget class="QFrame" name="m_GeometryFrame">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_7">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="2" column="2">
+              <widget class="QDoubleSpinBox" name="m_SpacingY">
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>50.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="value">
+                <double>2.000000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="label_2">
+               <property name="text">
+                <string>Image Spacing:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="3">
+              <widget class="QDoubleSpinBox" name="m_SpacingZ">
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>50.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="value">
+                <double>2.000000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QDoubleSpinBox" name="m_SpacingX">
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>50.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="value">
+                <double>2.000000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label">
+               <property name="text">
+                <string>Image Dimensions:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QSpinBox" name="m_SizeX">
+               <property name="toolTip">
+                <string>Fiber sampling factor which determines the accuracy of the calculated fiber and non-fiber volume fractions.</string>
+               </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>1000</number>
+               </property>
+               <property name="singleStep">
+                <number>1</number>
+               </property>
+               <property name="value">
+                <number>20</number>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QSpinBox" name="m_SizeY">
+               <property name="toolTip">
+                <string>Fiber sampling factor which determines the accuracy of the calculated fiber and non-fiber volume fractions.</string>
+               </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>1000</number>
+               </property>
+               <property name="singleStep">
+                <number>1</number>
+               </property>
+               <property name="value">
+                <number>20</number>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="3">
+              <widget class="QSpinBox" name="m_SizeZ">
+               <property name="toolTip">
+                <string>Fiber sampling factor which determines the accuracy of the calculated fiber and non-fiber volume fractions.</string>
+               </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>1000</number>
+               </property>
+               <property name="singleStep">
+                <number>1</number>
+               </property>
+               <property name="value">
+                <number>3</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="8" column="0">
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string>Inter-axonal Compartment</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_17">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="m_Compartment2Box">
+            <property name="toolTip">
+             <string>Select signal model for intra-axonal compartment.</string>
+            </property>
+            <item>
+             <property name="text">
+              <string>--</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Stick Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Zeppelin Model</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Tensor Model</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QmitkZeppelinModelParametersWidget" name="m_ZeppelinWidget2" native="true"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QmitkStickModelParametersWidget" name="m_StickWidget2" native="true"/>
+          </item>
+          <item row="3" column="0">
+           <widget class="QmitkTensorModelParametersWidget" name="m_TensorWidget2" native="true"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget2" native="true"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QFrame" name="m_Comp2FractionFrame">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_27">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="m_NoiseLabel_7">
+               <property name="text">
+                <string>Volume Fraction:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp2VolumeFraction">
+               <property name="toolTip">
+                <string>Optional! If no volume fraction map for this compartment is set, the corresponding volume fractions are calculated from the input fibers.</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="11" column="0">
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Noise and other Artifacts</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_6">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="12" column="0">
+           <widget class="QCheckBox" name="m_AddDistortions">
+            <property name="text">
+             <string>Add Distortions</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="m_AddSpikes">
+            <property name="text">
+             <string>Add Spikes</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="20" column="0">
+           <widget class="QFrame" name="m_EddyFrame">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QFormLayout" name="formLayout_8">
+             <property name="fieldGrowthPolicy">
+              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+             </property>
+             <property name="horizontalSpacing">
+              <number>6</number>
+             </property>
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_26">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Gradient:</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QDoubleSpinBox" name="m_EddyGradientStrength">
+               <property name="toolTip">
+                <string>Eddy current induced magnetic field gradient (in mT/m).</string>
+               </property>
+               <property name="decimals">
+                <number>4</number>
+               </property>
+               <property name="maximum">
+                <double>1000.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.001000000000000</double>
+               </property>
+               <property name="value">
+                <double>0.010000000000000</double>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="15" column="0">
+           <widget class="QCheckBox" name="m_AddMotion">
+            <property name="text">
+             <string>Add Motion Artifacts</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="Line" name="line_8">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QFrame" name="m_GhostFrame">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QFormLayout" name="formLayout_6">
+             <property name="horizontalSpacing">
+              <number>6</number>
+             </property>
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_23">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
+               <property name="text">
+                <string>K-Space Line Offset:</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QDoubleSpinBox" name="m_kOffsetBox">
+               <property name="toolTip">
+                <string>A larger offset increases the inensity of the ghost image.</string>
+               </property>
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="maximum">
+                <double>1.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.010000000000000</double>
+               </property>
+               <property name="value">
+                <double>0.250000000000000</double>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="m_AddNoise">
+            <property name="text">
+             <string>Add Noise</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QFrame" name="m_SpikeFrame">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QFormLayout" name="formLayout_9">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="m_NoiseLabel_2">
+               <property name="text">
+                <string>Num. Spikes:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QSpinBox" name="m_SpikeNumBox">
+               <property name="toolTip">
+                <string>The number of randomly occurring signal spikes.</string>
+               </property>
+               <property name="value">
+                <number>1</number>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QDoubleSpinBox" name="m_SpikeScaleBox">
+               <property name="toolTip">
+                <string>Spike amplitude relative to the largest signal amplitude of the corresponding k-space slice.</string>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="value">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="m_NoiseLabel_4">
+               <property name="text">
+                <string>Scale:</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="16" column="0">
+           <widget class="QFrame" name="m_MotionArtifactFrame">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_18">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>6</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <property name="horizontalSpacing">
+              <number>6</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="m_RandomMotion">
+               <property name="toolTip">
+                <string>Toggle between random movement and linear movement.</string>
+               </property>
+               <property name="text">
+                <string>Randomize motion</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QGroupBox" name="m_RotationArtifactFrame">
+               <property name="title">
+                <string>Rotation</string>
+               </property>
+               <layout class="QGridLayout" name="gridLayout_19">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>9</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item row="1" column="0">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_36">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>Degree:</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_29">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>x</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_28">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>Axis:</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QDoubleSpinBox" name="m_MaxRotationBoxX">
+                  <property name="toolTip">
+                   <string>Maximum rotation around x-axis.</string>
+                  </property>
+                  <property name="decimals">
+                   <number>1</number>
+                  </property>
+                  <property name="minimum">
+                   <double>-360.000000000000000</double>
+                  </property>
+                  <property name="maximum">
+                   <double>360.000000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>1.000000000000000</double>
+                  </property>
+                  <property name="value">
+                   <double>0.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="3">
+                 <widget class="QDoubleSpinBox" name="m_MaxRotationBoxZ">
+                  <property name="toolTip">
+                   <string>Maximum rotation around z-axis.</string>
+                  </property>
+                  <property name="decimals">
+                   <number>1</number>
+                  </property>
+                  <property name="minimum">
+                   <double>-360.000000000000000</double>
+                  </property>
+                  <property name="maximum">
+                   <double>360.000000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>1.000000000000000</double>
+                  </property>
+                  <property name="value">
+                   <double>15.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="2">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_30">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>y</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="3">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_31">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>z</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="2">
+                 <widget class="QDoubleSpinBox" name="m_MaxRotationBoxY">
+                  <property name="toolTip">
+                   <string>Maximum rotation around y-axis.</string>
+                  </property>
+                  <property name="decimals">
+                   <number>1</number>
+                  </property>
+                  <property name="minimum">
+                   <double>-360.000000000000000</double>
+                  </property>
+                  <property name="maximum">
+                   <double>360.000000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>1.000000000000000</double>
+                  </property>
+                  <property name="value">
+                   <double>0.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item row="4" column="0">
+              <widget class="QGroupBox" name="m_TranslationArtifactFrame">
+               <property name="title">
+                <string>Translation</string>
+               </property>
+               <layout class="QGridLayout" name="gridLayout_28">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item row="1" column="0">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_48">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>Distance:</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_51">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>x</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="2">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_52">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>y</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_47">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>Axis:</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="3">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_53">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
+                  <property name="text">
+                   <string>z</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QDoubleSpinBox" name="m_MaxTranslationBoxX">
+                  <property name="toolTip">
+                   <string>Maximum translation along x-axis.</string>
+                  </property>
+                  <property name="decimals">
+                   <number>1</number>
+                  </property>
+                  <property name="minimum">
+                   <double>-1000.000000000000000</double>
+                  </property>
+                  <property name="maximum">
+                   <double>1000.000000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>1.000000000000000</double>
+                  </property>
+                  <property name="value">
+                   <double>0.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="2">
+                 <widget class="QDoubleSpinBox" name="m_MaxTranslationBoxY">
+                  <property name="toolTip">
+                   <string>Maximum translation along y-axis.</string>
+                  </property>
+                  <property name="decimals">
+                   <number>1</number>
+                  </property>
+                  <property name="minimum">
+                   <double>-1000.000000000000000</double>
+                  </property>
+                  <property name="maximum">
+                   <double>1000.000000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>1.000000000000000</double>
+                  </property>
+                  <property name="value">
+                   <double>0.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="3">
+                 <widget class="QDoubleSpinBox" name="m_MaxTranslationBoxZ">
+                  <property name="toolTip">
+                   <string>Maximum translation along z-axis.</string>
+                  </property>
+                  <property name="decimals">
+                   <number>1</number>
+                  </property>
+                  <property name="minimum">
+                   <double>-1000.000000000000000</double>
+                  </property>
+                  <property name="maximum">
+                   <double>1000.000000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>1.000000000000000</double>
+                  </property>
+                  <property name="value">
+                   <double>0.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QFrame" name="frame_7">
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
+               </property>
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
+               </property>
+               <layout class="QGridLayout" name="gridLayout_31">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>0</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="label_3">
+                  <property name="text">
+                   <string>Motion volumes:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QLineEdit" name="m_MotionVolumesBox">
+                  <property name="toolTip">
+                   <string>Type in the volume indices that should be affected by motion (e.g. &quot;0 3 7&quot; whithout quotation marks). Leave blank for motion in all volumes. Type in &quot;random&quot; to randomly select volumes for motion. A list of negative numbers (e.g. -1 -2 -3) excludes volumes (e.g. 1 2 3) selects all remaining volumes. </string>
+                  </property>
+                  <property name="text">
+                   <string>random</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="22" column="0">
+           <widget class="QCheckBox" name="m_AddGibbsRinging">
+            <property name="toolTip">
+             <string>Add ringing artifacts occuring at strong edges in the image.</string>
+            </property>
+            <property name="text">
+             <string>Add Gibbs Ringing</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="Line" name="line_9">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="Line" name="line_7">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="18" column="0">
+           <widget class="Line" name="line_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="21" column="0">
+           <widget class="Line" name="line">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="m_AddGhosts">
+            <property name="text">
+             <string>Add N/2 Ghosts</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0">
+           <widget class="QCheckBox" name="m_AddAliasing">
+            <property name="text">
+             <string>Add Aliasing</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="0">
+           <widget class="Line" name="line_6">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="0">
+           <widget class="Line" name="line_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="19" column="0">
+           <widget class="QCheckBox" name="m_AddEddy">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Add Eddy Current Effects</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="10" column="0">
+           <widget class="QFrame" name="m_AliasingFrame">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_7">
+            <layout class="QFormLayout" name="formLayout_10">
+             <property name="horizontalSpacing">
+              <number>6</number>
+             </property>
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="2" column="2">
-              <widget class="QDoubleSpinBox" name="m_SpacingY">
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>0.100000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>50.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-               <property name="value">
-                <double>2.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>Image Spacing:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="3">
-              <widget class="QDoubleSpinBox" name="m_SpacingZ">
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>0.100000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>50.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-               <property name="value">
-                <double>2.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QDoubleSpinBox" name="m_SpacingX">
-               <property name="decimals">
-                <number>3</number>
-               </property>
-               <property name="minimum">
-                <double>0.100000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>50.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-               <property name="value">
-                <double>2.000000000000000</double>
-               </property>
-              </widget>
-             </item>
              <item row="0" column="0">
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>Image Dimensions:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QSpinBox" name="m_SizeX">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_27">
                <property name="toolTip">
-                <string>Fiber sampling factor which determines the accuracy of the calculated fiber and non-fiber volume fractions.</string>
+                <string/>
                </property>
-               <property name="minimum">
-                <number>1</number>
+               <property name="statusTip">
+                <string/>
                </property>
-               <property name="maximum">
-                <number>1000</number>
+               <property name="whatsThis">
+                <string/>
                </property>
-               <property name="singleStep">
-                <number>1</number>
+               <property name="text">
+                <string>Shrink FOV (%):</string>
                </property>
-               <property name="value">
-                <number>20</number>
+               <property name="wordWrap">
+                <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="0" column="2">
-              <widget class="QSpinBox" name="m_SizeY">
+             <item row="0" column="1">
+              <widget class="QDoubleSpinBox" name="m_WrapBox">
                <property name="toolTip">
-                <string>Fiber sampling factor which determines the accuracy of the calculated fiber and non-fiber volume fractions.</string>
-               </property>
-               <property name="minimum">
-                <number>1</number>
-               </property>
-               <property name="maximum">
-                <number>1000</number>
+                <string>Shrink FOV by this percentage.</string>
                </property>
-               <property name="singleStep">
+               <property name="decimals">
                 <number>1</number>
                </property>
-               <property name="value">
-                <number>20</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="3">
-              <widget class="QSpinBox" name="m_SizeZ">
-               <property name="toolTip">
-                <string>Fiber sampling factor which determines the accuracy of the calculated fiber and non-fiber volume fractions.</string>
-               </property>
                <property name="minimum">
-                <number>1</number>
+                <double>0.000000000000000</double>
                </property>
                <property name="maximum">
-                <number>1000</number>
+                <double>90.000000000000000</double>
                </property>
                <property name="singleStep">
-                <number>1</number>
+                <double>0.100000000000000</double>
                </property>
                <property name="value">
-                <number>3</number>
+                <double>25.000000000000000</double>
                </property>
               </widget>
              </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="9" column="0">
-        <widget class="QGroupBox" name="groupBox_5">
-         <property name="title">
-          <string>Inter-axonal Compartment</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_17">
-          <item row="0" column="0">
-           <widget class="QComboBox" name="m_Compartment2Box">
-            <property name="toolTip">
-             <string>Select signal model for intra-axonal compartment.</string>
-            </property>
-            <item>
-             <property name="text">
-              <string>--</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Stick Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Zeppelin Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Tensor Model</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QmitkZeppelinModelParametersWidget" name="m_ZeppelinWidget2" native="true"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QmitkStickModelParametersWidget" name="m_StickWidget2" native="true"/>
-          </item>
-          <item row="3" column="0">
-           <widget class="QmitkTensorModelParametersWidget" name="m_TensorWidget2" native="true"/>
-          </item>
-          <item row="4" column="0">
-           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget2" native="true"/>
+            </layout>
+           </widget>
           </item>
-          <item row="5" column="0">
-           <widget class="QFrame" name="m_Comp2FractionFrame">
+          <item row="13" column="0">
+           <widget class="QFrame" name="m_DistortionsFrame">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_27">
+            <layout class="QFormLayout" name="formLayout_7">
+             <property name="horizontalSpacing">
+              <number>6</number>
+             </property>
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item row="0" column="0">
-              <widget class="QLabel" name="m_NoiseLabel_7">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_25">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
                <property name="text">
-                <string>Volume Fraction:</string>
+                <string>Frequency Map:</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp2VolumeFraction">
+              <widget class="QmitkDataStorageComboBox" name="m_FrequencyMapBox">
                <property name="toolTip">
-                <string>Optional! If no volume fraction map for this compartment is set, the corresponding volume fractions are calculated from the input fibers.</string>
+                <string>Select image specifying the frequency inhomogeneities (in Hz).</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QCommandLinkButton" name="m_AbortSimulationButton">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="toolTip">
-          <string>Stop current simulation.</string>
-         </property>
-         <property name="text">
-          <string>Abort Simulation</string>
-         </property>
-         <property name="icon">
-          <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-           <normaloff>:/QmitkDiffusionImaging/general_icons/abort.ico</normaloff>:/QmitkDiffusionImaging/general_icons/abort.ico</iconset>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" rowspan="2">
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Data</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_10">
-          <item row="4" column="2">
-           <widget class="QFrame" name="frame_6">
+          <item row="1" column="0">
+           <widget class="QFrame" name="m_NoiseFrame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_20">
+            <layout class="QFormLayout" name="formLayout_5">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <property name="spacing">
-              <number>0</number>
-             </property>
+             <item row="1" column="0">
+              <widget class="QLabel" name="m_NoiseLabel">
+               <property name="text">
+                <string>Variance:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QDoubleSpinBox" name="m_NoiseLevel">
+               <property name="toolTip">
+                <string>Variance of selected noise distribution.</string>
+               </property>
+               <property name="decimals">
+                <number>10</number>
+               </property>
+               <property name="minimum">
+                <double>0.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>999999999.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.001000000000000</double>
+               </property>
+               <property name="value">
+                <double>50.000000000000000</double>
+               </property>
+              </widget>
+             </item>
              <item row="0" column="0">
-              <widget class="QLineEdit" name="m_SavePathEdit">
+              <widget class="QLabel" name="m_NoiseLabel_5">
                <property name="text">
-                <string>-</string>
+                <string>Distribution:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="QToolButton" name="m_OutputPathButton">
-               <property name="text">
-                <string>...</string>
+              <widget class="QComboBox" name="m_NoiseDistributionBox">
+               <property name="toolTip">
+                <string>Noise distribution</string>
                </property>
+               <item>
+                <property name="text">
+                 <string>Complex Gaussian</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>Rician</string>
+                </property>
+               </item>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="2" column="2">
-           <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_MaskComboBox">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a binary image to define the area of signal generation. Outside of the mask image only noise will be actively generated.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" rowspan="2" colspan="2">
-           <widget class="QLabel" name="m_TensorsToDWIBValueLabel_16">
-            <property name="toolTip">
-             <string/>
-            </property>
-            <property name="statusTip">
-             <string/>
-            </property>
-            <property name="whatsThis">
-             <string/>
-            </property>
-            <property name="text">
-             <string>Fiber Bundle:</string>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="m_TensorsToDWIBValueLabel_10">
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="toolBoxPage1" native="true">
+      <attribute name="label">
+       <string>Fiber Definition</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_8">
+       <property name="verticalSpacing">
+        <number>25</number>
+       </property>
+       <item row="7" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="m_FiberGenMessage">
+         <property name="styleSheet">
+          <string notr="true">color: rgb(255, 0, 0);</string>
+         </property>
+         <property name="text">
+          <string>Please select an image or an existing fiber bundle to draw the fiber fiducials. If you can't provide a suitable image, generate one using the &quot;Signal Generation&quot; tab.</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::AutoText</enum>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignJustify|Qt::AlignVCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QGroupBox" name="groupBox_7">
+         <property name="title">
+          <string>Fiducial Options</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_16">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="m_ConstantRadiusBox">
             <property name="toolTip">
-             <string/>
-            </property>
-            <property name="statusTip">
-             <string/>
-            </property>
-            <property name="whatsThis">
-             <string/>
+             <string>All fiducials are treated as circles with the same radius as the first fiducial. </string>
             </property>
             <property name="text">
-             <string>Save path:</string>
+             <string>Use Constant Fiducial Radius</string>
             </property>
-            <property name="wordWrap">
+            <property name="checked">
              <bool>false</bool>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="m_TensorsToDWIBValueLabel_3">
-            <property name="toolTip">
-             <string/>
-            </property>
-            <property name="statusTip">
-             <string/>
-            </property>
-            <property name="whatsThis">
-             <string/>
-            </property>
-            <property name="text">
-             <string>Tissue Mask:</string>
-            </property>
-            <property name="wordWrap">
+          <item row="1" column="0">
+           <widget class="QCommandLinkButton" name="m_AlignOnGrid">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_FiberBundleComboBox">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a fiber bundle to generate the white matter signal from. You can either use the fiber definition tab to manually define an input fiber bundle or you can also use any existing bundle, e.g. yielded by a tractography algorithm.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="m_TensorsToDWIBValueLabel_11">
             <property name="toolTip">
-             <string/>
-            </property>
-            <property name="statusTip">
-             <string/>
-            </property>
-            <property name="whatsThis">
-             <string/>
+             <string>Align selected fiducials with voxel grid. Shifts selected fiducials to nearest voxel center.</string>
             </property>
             <property name="text">
-             <string>Template Image:</string>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_TemplateComboBox">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The parameters for the simulation (e.g. spacing, size, diffuison-weighted gradients, b-value) are adopted from this image.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>Align With Grid</string>
             </property>
-            <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+            <property name="icon">
+             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+              <normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</iconset>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QTextEdit" name="m_SimulationStatusText">
-         <property name="font">
-          <font>
-           <family>Courier</family>
-           <pointsize>7</pointsize>
-          </font>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="0">
-        <widget class="QGroupBox" name="groupBox_3">
+       <item row="6" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
-          <string>Noise and other Artifacts</string>
+          <string>Operations</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_6">
-          <item row="12" column="0">
-           <widget class="QCheckBox" name="m_AddDistortions">
-            <property name="text">
-             <string>Add Distortions</string>
-            </property>
-            <property name="checked">
+         <layout class="QGridLayout" name="gridLayout_11">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="5" column="0">
+           <widget class="QCommandLinkButton" name="m_JoinBundlesButton">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QCheckBox" name="m_AddSpikes">
             <property name="text">
-             <string>Add Spikes</string>
+             <string>Join Bundles</string>
             </property>
-            <property name="checked">
-             <bool>false</bool>
+            <property name="icon">
+             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+              <normaloff>:/QmitkDiffusionImaging/general_icons/plus.ico</normaloff>:/QmitkDiffusionImaging/general_icons/plus.ico</iconset>
             </property>
            </widget>
           </item>
-          <item row="20" column="0">
-           <widget class="QFrame" name="m_EddyFrame">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="2" column="0">
+           <widget class="QFrame" name="frame_4">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QFormLayout" name="formLayout_8">
-             <property name="fieldGrowthPolicy">
-              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-             </property>
-             <property name="horizontalSpacing">
-              <number>6</number>
-             </property>
+            <layout class="QGridLayout" name="gridLayout_12">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_26">
+             <item row="1" column="2">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_18">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
-                <string>Gradient:</string>
+                <string>Y</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QDoubleSpinBox" name="m_EddyGradientStrength">
+             <item row="2" column="1">
+              <widget class="QDoubleSpinBox" name="m_XrotBox">
                <property name="toolTip">
-                <string>Eddy current induced magnetic field gradient (in mT/m).</string>
+                <string>Rotation angle (in degree) around x-axis.</string>
                </property>
                <property name="decimals">
-                <number>4</number>
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>-360.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>360.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_22">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Axis:</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="2">
+              <widget class="QDoubleSpinBox" name="m_YrotBox">
+               <property name="toolTip">
+                <string>Rotation angle (in degree) around y-axis.</string>
+               </property>
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>-360.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>360.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_21">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Translation:</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="3">
+              <widget class="QDoubleSpinBox" name="m_ZtransBox">
+               <property name="toolTip">
+                <string>Translation (in mm) in direction of the z-axis.</string>
+               </property>
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>-1000.000000000000000</double>
                </property>
                <property name="maximum">
                 <double>1000.000000000000000</double>
                </property>
                <property name="singleStep">
-                <double>0.001000000000000</double>
+                <double>0.100000000000000</double>
                </property>
-               <property name="value">
-                <double>0.010000000000000</double>
+              </widget>
+             </item>
+             <item row="3" column="2">
+              <widget class="QDoubleSpinBox" name="m_YtransBox">
+               <property name="toolTip">
+                <string>Translation (in mm) in direction of the y-axis.</string>
+               </property>
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>-1000.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>1000.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
                </property>
               </widget>
              </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="15" column="0">
-           <widget class="QCheckBox" name="m_AddMotion">
-            <property name="text">
-             <string>Add Motion Artifacts</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="Line" name="line_8">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
-           <widget class="QFrame" name="m_GhostFrame">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <layout class="QFormLayout" name="formLayout_6">
-             <property name="horizontalSpacing">
-              <number>6</number>
-             </property>
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_23">
+             <item row="1" column="1">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_17">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
+               <property name="text">
+                <string>X</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_20">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Rotation:</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="3">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_19">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="statusTip">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Z</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="3">
+              <widget class="QDoubleSpinBox" name="m_ZrotBox">
+               <property name="toolTip">
+                <string>Rotation angle (in degree) around z-axis.</string>
+               </property>
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>-360.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>360.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <widget class="QDoubleSpinBox" name="m_XtransBox">
+               <property name="toolTip">
+                <string>Translation (in mm) in direction of the x-axis.</string>
+               </property>
+               <property name="decimals">
+                <number>3</number>
+               </property>
+               <property name="minimum">
+                <double>-1000.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>1000.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="0">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_24">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string/>
                </property>
                <property name="text">
-                <string>K-Space Line Offset:</string>
+                <string>Scaling:</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QDoubleSpinBox" name="m_kOffsetBox">
+             <item row="4" column="1">
+              <widget class="QDoubleSpinBox" name="m_XscaleBox">
                <property name="toolTip">
-                <string>A larger offset increases the inensity of the ghost image.</string>
+                <string>Scaling factor for selected fiber bundle along the x-axis.</string>
                </property>
-               <property name="decimals">
-                <number>3</number>
+               <property name="minimum">
+                <double>0.010000000000000</double>
                </property>
                <property name="maximum">
-                <double>1.000000000000000</double>
+                <double>10.000000000000000</double>
                </property>
                <property name="singleStep">
                 <double>0.010000000000000</double>
                </property>
                <property name="value">
-                <double>0.250000000000000</double>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="m_AddNoise">
-            <property name="text">
-             <string>Add Noise</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QFrame" name="m_SpikeFrame">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <layout class="QFormLayout" name="formLayout_9">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_NoiseLabel_2">
-               <property name="text">
-                <string>Num. Spikes:</string>
+                <double>1.000000000000000</double>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QSpinBox" name="m_SpikeNumBox">
+             <item row="4" column="2">
+              <widget class="QDoubleSpinBox" name="m_YscaleBox">
                <property name="toolTip">
-                <string>The number of randomly occurring signal spikes.</string>
+                <string>Scaling factor for selected fiber bundle along the y-axis.</string>
+               </property>
+               <property name="minimum">
+                <double>0.010000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>10.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.010000000000000</double>
                </property>
                <property name="value">
-                <number>1</number>
+                <double>1.000000000000000</double>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
-              <widget class="QDoubleSpinBox" name="m_SpikeScaleBox">
+             <item row="4" column="3">
+              <widget class="QDoubleSpinBox" name="m_ZscaleBox">
                <property name="toolTip">
-                <string>Spike amplitude relative to the largest signal amplitude of the corresponding k-space slice.</string>
+                <string>Scaling factor for selected fiber bundle along the z-axis.</string>
+               </property>
+               <property name="minimum">
+                <double>0.010000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>10.000000000000000</double>
                </property>
                <property name="singleStep">
-                <double>0.100000000000000</double>
+                <double>0.010000000000000</double>
                </property>
                <property name="value">
-                <double>0.100000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="m_NoiseLabel_4">
-               <property name="text">
-                <string>Scale:</string>
+                <double>1.000000000000000</double>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="16" column="0">
-           <widget class="QFrame" name="m_MotionArtifactFrame">
+          <item row="4" column="0">
+           <widget class="QCommandLinkButton" name="m_CopyBundlesButton">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Copy Bundles</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+              <normaloff>:/QmitkDiffusionImaging/general_icons/copy2.ico</normaloff>:/QmitkDiffusionImaging/general_icons/copy2.ico</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCommandLinkButton" name="m_TransformBundlesButton">
             <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Transform Selection</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+              <normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="m_IncludeFiducials">
+            <property name="toolTip">
+             <string>If checked, the fiducials belonging to the modified bundle are also modified.</string>
+            </property>
+            <property name="text">
+             <string>Include Fiducials</string>
+            </property>
+            <property name="checked">
              <bool>true</bool>
             </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QGroupBox" name="groupBox_8">
+         <property name="title">
+          <string>Fiber Options</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_15">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="2" column="0">
+           <widget class="QFrame" name="frame_5">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_18">
+            <layout class="QGridLayout" name="gridLayout_9">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
-              <number>6</number>
+              <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <property name="horizontalSpacing">
-              <number>6</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QCheckBox" name="m_RandomMotion">
-               <property name="toolTip">
-                <string>Toggle between random movement and linear movement.</string>
-               </property>
-               <property name="text">
-                <string>Randomize motion</string>
-               </property>
-               <property name="checked">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QGroupBox" name="m_RotationArtifactFrame">
-               <property name="title">
-                <string>Rotation</string>
+             <item row="2" column="0">
+              <widget class="QFrame" name="m_AdvancedFiberOptionsFrame">
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
                </property>
-               <layout class="QGridLayout" name="gridLayout_19">
-                <property name="leftMargin">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>9</number>
-                </property>
-                <property name="rightMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>0</number>
-                </property>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_36">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>Degree:</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_29">
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
+               </property>
+               <layout class="QGridLayout" name="gridLayout_21">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>0</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item row="1" column="0">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_5">
                   <property name="toolTip">
                    <string/>
                   </property>
                   <property name="statusTip">
                    <string/>
                   </property>
                   <property name="whatsThis">
                    <string/>
                   </property>
                   <property name="text">
-                   <string>x</string>
+                   <string>Tension:</string>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_28">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_8">
                   <property name="toolTip">
                    <string/>
                   </property>
                   <property name="statusTip">
                    <string/>
                   </property>
                   <property name="whatsThis">
                    <string/>
                   </property>
                   <property name="text">
-                   <string>Axis:</string>
+                   <string>Fiber Sampling:</string>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
                   </property>
                  </widget>
                 </item>
                 <item row="1" column="1">
-                 <widget class="QDoubleSpinBox" name="m_MaxRotationBoxX">
+                 <widget class="QDoubleSpinBox" name="m_TensionBox">
                   <property name="toolTip">
-                   <string>Maximum rotation around x-axis.</string>
+                   <string/>
                   </property>
                   <property name="decimals">
-                   <number>1</number>
+                   <number>3</number>
                   </property>
                   <property name="minimum">
-                   <double>-360.000000000000000</double>
+                   <double>-1.000000000000000</double>
                   </property>
                   <property name="maximum">
-                   <double>360.000000000000000</double>
+                   <double>1.000000000000000</double>
                   </property>
                   <property name="singleStep">
-                   <double>1.000000000000000</double>
+                   <double>0.100000000000000</double>
                   </property>
                   <property name="value">
                    <double>0.000000000000000</double>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="3">
-                 <widget class="QDoubleSpinBox" name="m_MaxRotationBoxZ">
-                  <property name="toolTip">
-                   <string>Maximum rotation around z-axis.</string>
-                  </property>
+                <item row="3" column="1">
+                 <widget class="QDoubleSpinBox" name="m_BiasBox">
                   <property name="decimals">
-                   <number>1</number>
+                   <number>3</number>
                   </property>
                   <property name="minimum">
-                   <double>-360.000000000000000</double>
+                   <double>-1.000000000000000</double>
                   </property>
                   <property name="maximum">
-                   <double>360.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
                    <double>1.000000000000000</double>
                   </property>
-                  <property name="value">
-                   <double>15.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="2">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_30">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>y</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="3">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_31">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>z</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="2">
-                 <widget class="QDoubleSpinBox" name="m_MaxRotationBoxY">
-                  <property name="toolTip">
-                   <string>Maximum rotation around y-axis.</string>
-                  </property>
-                  <property name="decimals">
-                   <number>1</number>
-                  </property>
-                  <property name="minimum">
-                   <double>-360.000000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>360.000000000000000</double>
-                  </property>
                   <property name="singleStep">
-                   <double>1.000000000000000</double>
+                   <double>0.100000000000000</double>
                   </property>
                   <property name="value">
                    <double>0.000000000000000</double>
                   </property>
                  </widget>
                 </item>
-               </layout>
-              </widget>
-             </item>
-             <item row="4" column="0">
-              <widget class="QGroupBox" name="m_TranslationArtifactFrame">
-               <property name="title">
-                <string>Translation</string>
-               </property>
-               <layout class="QGridLayout" name="gridLayout_28">
-                <property name="leftMargin">
-                 <number>0</number>
-                </property>
-                <property name="rightMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>0</number>
-                </property>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_48">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>Distance:</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_51">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>x</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="2">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_52">
-                  <property name="toolTip">
-                   <string/>
-                  </property>
-                  <property name="statusTip">
-                   <string/>
-                  </property>
-                  <property name="whatsThis">
-                   <string/>
-                  </property>
-                  <property name="text">
-                   <string>y</string>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="0">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_47">
+                <item row="3" column="0">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_7">
                   <property name="toolTip">
                    <string/>
                   </property>
                   <property name="statusTip">
                    <string/>
                   </property>
                   <property name="whatsThis">
                    <string/>
                   </property>
                   <property name="text">
-                   <string>Axis:</string>
+                   <string>Bias:</string>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="3">
-                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_53">
+                <item row="2" column="0">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_6">
                   <property name="toolTip">
                    <string/>
                   </property>
                   <property name="statusTip">
                    <string/>
                   </property>
                   <property name="whatsThis">
                    <string/>
                   </property>
                   <property name="text">
-                   <string>z</string>
+                   <string>Continuity:</string>
                   </property>
                   <property name="wordWrap">
                    <bool>false</bool>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1">
-                 <widget class="QDoubleSpinBox" name="m_MaxTranslationBoxX">
-                  <property name="toolTip">
-                   <string>Maximum translation along x-axis.</string>
-                  </property>
+                <item row="2" column="1">
+                 <widget class="QDoubleSpinBox" name="m_ContinuityBox">
                   <property name="decimals">
-                   <number>1</number>
+                   <number>3</number>
                   </property>
                   <property name="minimum">
-                   <double>-1000.000000000000000</double>
+                   <double>-1.000000000000000</double>
                   </property>
                   <property name="maximum">
-                   <double>1000.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
                    <double>1.000000000000000</double>
                   </property>
-                  <property name="value">
-                   <double>0.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="2">
-                 <widget class="QDoubleSpinBox" name="m_MaxTranslationBoxY">
-                  <property name="toolTip">
-                   <string>Maximum translation along y-axis.</string>
-                  </property>
-                  <property name="decimals">
-                   <number>1</number>
-                  </property>
-                  <property name="minimum">
-                   <double>-1000.000000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>1000.000000000000000</double>
-                  </property>
                   <property name="singleStep">
-                   <double>1.000000000000000</double>
+                   <double>0.100000000000000</double>
                   </property>
                   <property name="value">
                    <double>0.000000000000000</double>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="3">
-                 <widget class="QDoubleSpinBox" name="m_MaxTranslationBoxZ">
+                <item row="0" column="1">
+                 <widget class="QDoubleSpinBox" name="m_FiberSamplingBox">
                   <property name="toolTip">
-                   <string>Maximum translation along z-axis.</string>
+                   <string>Distance of fiber sampling points (in mm)</string>
                   </property>
                   <property name="decimals">
                    <number>1</number>
                   </property>
                   <property name="minimum">
-                   <double>-1000.000000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>1000.000000000000000</double>
+                   <double>0.100000000000000</double>
                   </property>
                   <property name="singleStep">
-                   <double>1.000000000000000</double>
+                   <double>0.100000000000000</double>
                   </property>
                   <property name="value">
-                   <double>0.000000000000000</double>
+                   <double>1.000000000000000</double>
                   </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
-             <item row="2" column="0">
-              <widget class="QFrame" name="frame_7">
+             <item row="1" column="0">
+              <widget class="QFrame" name="frame_2">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Raised</enum>
                </property>
-               <layout class="QGridLayout" name="gridLayout_31">
+               <layout class="QGridLayout" name="gridLayout_25">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
+                <property name="verticalSpacing">
+                 <number>6</number>
+                </property>
                 <item row="0" column="0">
-                 <widget class="QLabel" name="label_3">
+                 <widget class="QLabel" name="m_TensorsToDWIBValueLabel_4">
+                  <property name="toolTip">
+                   <string/>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="whatsThis">
+                   <string/>
+                  </property>
                   <property name="text">
-                   <string>Motion volumes:</string>
+                   <string>#Fibers:</string>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
-                 <widget class="QLineEdit" name="m_MotionVolumesBox">
+                 <widget class="QSpinBox" name="m_FiberDensityBox">
                   <property name="toolTip">
-                   <string>Type in the volume indices that should be affected by motion (e.g. &quot;0 3 7&quot; whithout quotation marks). Leave blank for motion in all volumes. Type in &quot;random&quot; to randomly select volumes for motion. A list of negative numbers (e.g. -1 -2 -3) excludes volumes (e.g. 1 2 3) selects all remaining volumes. </string>
+                   <string>Specify number of fibers to generate for the selected bundle.</string>
                   </property>
-                  <property name="text">
-                   <string>random</string>
+                  <property name="minimum">
+                   <number>1</number>
+                  </property>
+                  <property name="maximum">
+                   <number>1000000</number>
+                  </property>
+                  <property name="singleStep">
+                   <number>100</number>
+                  </property>
+                  <property name="value">
+                   <number>100</number>
                   </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="22" column="0">
-           <widget class="QCheckBox" name="m_AddGibbsRinging">
-            <property name="toolTip">
-             <string>Add ringing artifacts occuring at strong edges in the image.</string>
-            </property>
-            <property name="text">
-             <string>Add Gibbs Ringing</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="Line" name="line_9">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="0">
-           <widget class="Line" name="line_7">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="18" column="0">
-           <widget class="Line" name="line_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="21" column="0">
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QCheckBox" name="m_AddGhosts">
-            <property name="text">
-             <string>Add N/2 Ghosts</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="9" column="0">
-           <widget class="QCheckBox" name="m_AddAliasing">
-            <property name="text">
-             <string>Add Aliasing</string>
-            </property>
-            <property name="checked">
+          <item row="3" column="0">
+           <widget class="QCommandLinkButton" name="m_GenerateFibersButton">
+            <property name="enabled">
              <bool>false</bool>
             </property>
-           </widget>
-          </item>
-          <item row="11" column="0">
-           <widget class="Line" name="line_6">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="14" column="0">
-           <widget class="Line" name="line_5">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="19" column="0">
-           <widget class="QCheckBox" name="m_AddEddy">
-            <property name="toolTip">
-             <string/>
-            </property>
             <property name="text">
-             <string>Add Eddy Current Effects</string>
+             <string>Generate Fibers</string>
             </property>
-            <property name="checked">
-             <bool>false</bool>
+            <property name="icon">
+             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+              <normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</iconset>
             </property>
            </widget>
           </item>
-          <item row="10" column="0">
-           <widget class="QFrame" name="m_AliasingFrame">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="1" column="0">
+           <widget class="QFrame" name="frame_3">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QFormLayout" name="formLayout_10">
-             <property name="horizontalSpacing">
-              <number>6</number>
-             </property>
+            <layout class="QGridLayout" name="gridLayout_5">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_27">
-               <property name="toolTip">
-                <string/>
-               </property>
-               <property name="statusTip">
-                <string/>
-               </property>
-               <property name="whatsThis">
-                <string/>
-               </property>
-               <property name="text">
-                <string>Shrink FOV (%):</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
              <item row="0" column="1">
-              <widget class="QDoubleSpinBox" name="m_WrapBox">
+              <widget class="QComboBox" name="m_DistributionBox">
                <property name="toolTip">
-                <string>Shrink FOV by this percentage.</string>
-               </property>
-               <property name="decimals">
-                <number>1</number>
-               </property>
-               <property name="minimum">
-                <double>0.000000000000000</double>
-               </property>
-               <property name="maximum">
-                <double>90.000000000000000</double>
-               </property>
-               <property name="singleStep">
-                <double>0.100000000000000</double>
-               </property>
-               <property name="value">
-                <double>25.000000000000000</double>
+                <string>Select fiber distribution inside of the fiducials.</string>
                </property>
+               <item>
+                <property name="text">
+                 <string>Uniform</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>Gaussian</string>
+                </property>
+               </item>
               </widget>
              </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="13" column="0">
-           <widget class="QFrame" name="m_DistortionsFrame">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <layout class="QFormLayout" name="formLayout_7">
-             <property name="horizontalSpacing">
-              <number>6</number>
-             </property>
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
              <item row="0" column="0">
-              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_25">
+              <widget class="QLabel" name="m_TensorsToDWIBValueLabel_9">
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
-                <string/>
-               </property>
-               <property name="whatsThis">
-                <string/>
-               </property>
-               <property name="text">
-                <string>Frequency Map:</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QmitkDataStorageComboBox" name="m_FrequencyMapBox">
-               <property name="toolTip">
-                <string>Select image specifying the frequency inhomogeneities (in Hz).</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QFrame" name="m_NoiseFrame">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <layout class="QFormLayout" name="formLayout_5">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item row="1" column="0">
-              <widget class="QLabel" name="m_NoiseLabel">
+                <string/>
+               </property>
+               <property name="whatsThis">
+                <string/>
+               </property>
                <property name="text">
-                <string>Variance:</string>
+                <string>Fiber Distribution:</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
-              <widget class="QDoubleSpinBox" name="m_NoiseLevel">
+             <item row="0" column="2">
+              <widget class="QDoubleSpinBox" name="m_VarianceBox">
                <property name="toolTip">
-                <string>Variance of selected noise distribution.</string>
+                <string>Variance of the gaussian</string>
                </property>
                <property name="decimals">
-                <number>10</number>
+                <number>3</number>
                </property>
                <property name="minimum">
-                <double>0.000000000000000</double>
+                <double>0.001000000000000</double>
                </property>
                <property name="maximum">
-                <double>999999999.000000000000000</double>
+                <double>10.000000000000000</double>
                </property>
                <property name="singleStep">
-                <double>0.001000000000000</double>
+                <double>0.010000000000000</double>
                </property>
                <property name="value">
-                <double>50.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="m_NoiseLabel_5">
-               <property name="text">
-                <string>Distribution:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QComboBox" name="m_NoiseDistributionBox">
-               <property name="toolTip">
-                <string>Noise distribution</string>
+                <double>0.100000000000000</double>
                </property>
-               <item>
-                <property name="text">
-                 <string>Complex Gaussian</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Rician</string>
-                </property>
-               </item>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QCommandLinkButton" name="m_GenerateImageButton">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Start DWI generation from selected fiber bundle.&lt;/p&gt;&lt;p&gt;If no fiber bundle but an existing diffusion weighted image is selected, the enabled artifacts are added to this image.&lt;/p&gt;&lt;p&gt;If neither a fiber bundle nor a diffusion weighted image is selected, a grayscale image containing a simple gradient is generated.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Start Simulation</string>
-         </property>
-         <property name="icon">
-          <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-           <normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</normaloff>:/QmitkDiffusionImaging/general_icons/right.ico</iconset>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="0">
-        <widget class="QGroupBox" name="m_IntraAxonalGroupBox">
-         <property name="title">
-          <string>Intra-axonal Compartment</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_13">
-          <item row="3" column="0">
-           <widget class="QmitkTensorModelParametersWidget" name="m_TensorWidget1" native="true"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QmitkStickModelParametersWidget" name="m_StickWidget1" native="true"/>
-          </item>
-          <item row="4" column="0">
-           <widget class="QmitkPrototypeSignalParametersWidget" name="m_PrototypeWidget1" native="true"/>
-          </item>
           <item row="0" column="0">
-           <widget class="QComboBox" name="m_Compartment1Box">
-            <property name="toolTip">
-             <string>Select signal model for intra-axonal compartment.</string>
-            </property>
-            <item>
-             <property name="text">
-              <string>Stick Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Zeppelin Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Tensor Model</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Prototype Signal</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QmitkZeppelinModelParametersWidget" name="m_ZeppelinWidget1" native="true"/>
-          </item>
-          <item row="5" column="0">
-           <widget class="QFrame" name="m_Comp1FractionFrame">
+           <widget class="QFrame" name="frame_8">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_26">
+            <layout class="QGridLayout" name="gridLayout_22">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item row="0" column="0">
-              <widget class="QLabel" name="m_NoiseLabel_6">
+              <widget class="QCheckBox" name="m_RealTimeFibers">
+               <property name="toolTip">
+                <string>Disable to only generate fibers if &quot;Generate Fibers&quot; button is pressed.</string>
+               </property>
                <property name="text">
-                <string>Volume Fraction:</string>
+                <string>Real Time Fibers</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_Comp1VolumeFraction">
+              <widget class="QCheckBox" name="m_AdvancedOptionsBox">
                <property name="toolTip">
-                <string>Optional! If no volume fraction map for this compartment is set, the corresponding volume fractions are calculated from the input fibers.</string>
+                <string>Disable to only generate fibers if &quot;Generate Fibers&quot; button is pressed.</string>
+               </property>
+               <property name="text">
+                <string>Advanced Options</string>
+               </property>
+               <property name="checked">
+                <bool>false</bool>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
+       <item row="3" column="0">
+        <widget class="QFrame" name="frame">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QPushButton" name="m_CircleButton">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>30</width>
+              <height>30</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Draw elliptical fiducial.</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+              <normaloff>:/QmitkDiffusionImaging/circle.png</normaloff>:/QmitkDiffusionImaging/circle.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QPushButton" name="m_FlipButton">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>30</width>
+              <height>30</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Flip fiber waypoints of selcted fiducial around one axis.</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+              <normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</normaloff>:/QmitkDiffusionImaging/general_icons/refresh.ico</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QCommandLinkButton" name="m_SaveParametersButton">
-     <property name="text">
-      <string>Save Parameters</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-       <normaloff>:/QmitkDiffusionImaging/general_icons/download.ico</normaloff>:/QmitkDiffusionImaging/general_icons/download.ico</iconset>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QmitkDataStorageComboBoxWithSelectNone</class>
+   <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
-   <header>QmitkDataStorageComboBoxWithSelectNone.h</header>
+   <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
   <customwidget>
-   <class>QmitkDataStorageComboBox</class>
+   <class>QmitkDataStorageComboBoxWithSelectNone</class>
    <extends>QComboBox</extends>
-   <header location="global">QmitkDataStorageComboBox.h</header>
+   <header>QmitkDataStorageComboBoxWithSelectNone.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkTensorModelParametersWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkTensorModelParametersWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkStickModelParametersWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkStickModelParametersWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkZeppelinModelParametersWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkZeppelinModelParametersWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkBallModelParametersWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkBallModelParametersWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkAstrosticksModelParametersWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkAstrosticksModelParametersWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkDotModelParametersWidget</class>
    <extends>QWidget</extends>
    <header>QmitkDotModelParametersWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkPrototypeSignalParametersWidget</class>
    <extends>QWidget</extends>
    <header>QmitkPrototypeSignalParametersWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_CircleButton</tabstop>
   <tabstop>m_FlipButton</tabstop>
   <tabstop>m_RealTimeFibers</tabstop>
   <tabstop>m_AdvancedOptionsBox</tabstop>
   <tabstop>m_DistributionBox</tabstop>
   <tabstop>m_VarianceBox</tabstop>
   <tabstop>m_FiberDensityBox</tabstop>
   <tabstop>m_FiberSamplingBox</tabstop>
   <tabstop>m_TensionBox</tabstop>
   <tabstop>m_ContinuityBox</tabstop>
   <tabstop>m_BiasBox</tabstop>
   <tabstop>m_GenerateFibersButton</tabstop>
   <tabstop>m_ConstantRadiusBox</tabstop>
   <tabstop>m_AlignOnGrid</tabstop>
   <tabstop>m_XrotBox</tabstop>
   <tabstop>m_YrotBox</tabstop>
   <tabstop>m_ZrotBox</tabstop>
   <tabstop>m_XtransBox</tabstop>
   <tabstop>m_YtransBox</tabstop>
   <tabstop>m_ZtransBox</tabstop>
   <tabstop>m_XscaleBox</tabstop>
   <tabstop>m_YscaleBox</tabstop>
   <tabstop>m_ZscaleBox</tabstop>
   <tabstop>m_TransformBundlesButton</tabstop>
   <tabstop>m_CopyBundlesButton</tabstop>
   <tabstop>m_JoinBundlesButton</tabstop>
   <tabstop>m_IncludeFiducials</tabstop>
   <tabstop>m_FiberBundleComboBox</tabstop>
   <tabstop>m_MaskComboBox</tabstop>
   <tabstop>m_TemplateComboBox</tabstop>
   <tabstop>m_SavePathEdit</tabstop>
   <tabstop>m_OutputPathButton</tabstop>
-  <tabstop>m_GenerateImageButton</tabstop>
-  <tabstop>m_AbortSimulationButton</tabstop>
-  <tabstop>m_SimulationStatusText</tabstop>
   <tabstop>m_SizeX</tabstop>
   <tabstop>m_SizeY</tabstop>
   <tabstop>m_SizeZ</tabstop>
   <tabstop>m_SpacingX</tabstop>
   <tabstop>m_SpacingY</tabstop>
   <tabstop>m_SpacingZ</tabstop>
   <tabstop>m_NumGradientsBox</tabstop>
   <tabstop>m_BvalueBox</tabstop>
   <tabstop>m_AdvancedOptionsBox_2</tabstop>
   <tabstop>m_SignalScaleBox</tabstop>
   <tabstop>m_TEbox</tabstop>
   <tabstop>m_TRbox</tabstop>
   <tabstop>m_LineReadoutTimeBox</tabstop>
   <tabstop>m_PartialFourier</tabstop>
   <tabstop>m_T2starBox</tabstop>
   <tabstop>m_FiberRadius</tabstop>
   <tabstop>m_ReversePhaseBox</tabstop>
   <tabstop>m_RelaxationBox</tabstop>
   <tabstop>m_EnforcePureFiberVoxelsBox</tabstop>
   <tabstop>m_VolumeFractionsBox</tabstop>
   <tabstop>m_Compartment1Box</tabstop>
   <tabstop>m_Comp1VolumeFraction</tabstop>
   <tabstop>m_Compartment2Box</tabstop>
   <tabstop>m_Comp2VolumeFraction</tabstop>
   <tabstop>m_Compartment3Box</tabstop>
   <tabstop>m_Comp3VolumeFraction</tabstop>
   <tabstop>m_Compartment4Box</tabstop>
   <tabstop>m_Comp4VolumeFraction</tabstop>
   <tabstop>m_AddNoise</tabstop>
   <tabstop>m_NoiseDistributionBox</tabstop>
   <tabstop>m_NoiseLevel</tabstop>
   <tabstop>m_AddSpikes</tabstop>
   <tabstop>m_SpikeNumBox</tabstop>
   <tabstop>m_SpikeScaleBox</tabstop>
   <tabstop>m_AddGhosts</tabstop>
   <tabstop>m_kOffsetBox</tabstop>
   <tabstop>m_AddAliasing</tabstop>
   <tabstop>m_WrapBox</tabstop>
   <tabstop>m_AddDistortions</tabstop>
   <tabstop>m_FrequencyMapBox</tabstop>
   <tabstop>m_AddMotion</tabstop>
   <tabstop>m_RandomMotion</tabstop>
   <tabstop>m_MaxRotationBoxX</tabstop>
   <tabstop>m_MaxRotationBoxY</tabstop>
   <tabstop>m_MaxRotationBoxZ</tabstop>
   <tabstop>m_MaxTranslationBoxX</tabstop>
   <tabstop>m_MaxTranslationBoxY</tabstop>
   <tabstop>m_MaxTranslationBoxZ</tabstop>
   <tabstop>m_AddEddy</tabstop>
   <tabstop>m_EddyGradientStrength</tabstop>
   <tabstop>m_AddGibbsRinging</tabstop>
   <tabstop>m_SaveParametersButton</tabstop>
   <tabstop>m_LoadParametersButton</tabstop>
-  <tabstop>tabWidget</tabstop>
+  <tabstop>toolBox</tabstop>
  </tabstops>
  <resources>
   <include location="../../resources/QmitkDiffusionImaging.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.cpp
index fb4d79c51c..5a50e4ff51 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.cpp
@@ -1,310 +1,274 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 
 // MITK
 #include "QmitkFieldmapGeneratorView.h"
 #include <QmitkDataStorageComboBox.h>
 #include <mitkNodePredicateDataType.h>
 #include <itkFieldmapGeneratorFilter.h>
 #include <mitkImage.h>
 #include <mitkSliceNavigationController.h>
 #include <QmitkRenderWindow.h>
 
 const std::string QmitkFieldmapGeneratorView::VIEW_ID = "org.mitk.views.fieldmapgenerator";
 
 QmitkFieldmapGeneratorView::QmitkFieldmapGeneratorView()
   : QmitkAbstractView()
   , m_Controls( 0 )
 {
 
 }
 
 QmitkFieldmapGeneratorView::~QmitkFieldmapGeneratorView()
 {
 
 }
 
 void QmitkFieldmapGeneratorView::CreateQtPartControl( QWidget *parent )
 {
   // build up qt view, unless already done
   if ( !m_Controls )
   {
     // create GUI widgets from the Qt Designer's .ui file
     m_Controls = new Ui::QmitkFieldmapGeneratorViewControls;
     m_Controls->setupUi( parent );
 
     m_Controls->m_SelectedImageBox->SetDataStorage(this->GetDataStorage());
     mitk::TNodePredicateDataType<mitk::Image>::Pointer isMitkImage = mitk::TNodePredicateDataType<mitk::Image>::New();
     m_Controls->m_SelectedImageBox->SetPredicate(isMitkImage);
 
+    m_SliceChangeListener.RenderWindowPartActivated(this->GetRenderWindowPart());
+    connect(&m_SliceChangeListener, SIGNAL(SliceChanged()), this, SLOT(OnSliceChanged()));
+
     connect((QObject*) m_Controls->m_GenerateFieldmap, SIGNAL(clicked()), (QObject*) this, SLOT(GenerateFieldmap()));
     connect((QObject*) m_Controls->m_PlaceFieldSource, SIGNAL(clicked()), (QObject*) this, SLOT(PlaceFieldSource()));
     connect((QObject*) m_Controls->m_SourceVarianceBox, SIGNAL(valueChanged(double)), (QObject*) this, SLOT(OnVarianceChanged(double)));
     connect((QObject*) m_Controls->m_SourceHeightBox, SIGNAL(valueChanged(double)), (QObject*) this, SLOT(OnHeightChanged(double)));
 
   }
 }
 
 void QmitkFieldmapGeneratorView::SetFocus()
 {
   m_Controls->m_SelectedImageBox->setFocus();
 }
 
 void QmitkFieldmapGeneratorView::OnVarianceChanged(double value)
 {
   if (m_SelectedSource.IsNotNull())
   {
     m_SelectedSource->SetProperty("pointsize", mitk::FloatProperty::New(value));
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
 }
 
 void QmitkFieldmapGeneratorView::OnHeightChanged(double value)
 {
   if (m_SelectedSource.IsNotNull())
   {
     m_SelectedSource->SetProperty("color", mitk::ColorProperty::New(0, 0, value/100.0));
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
 }
 
 void QmitkFieldmapGeneratorView::PlaceFieldSource()
 {
   if (m_Controls->m_SelectedImageBox->GetSelectedNode().IsNull() || !this->GetRenderWindowPart())
   {
     m_Controls->m_WorldPosLabel->setText("-");
     m_Controls->m_IndexLabel->setText("-");
     return;
   }
 
   mitk::Point3D index;
   mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(m_Controls->m_SelectedImageBox->GetSelectedNode()->GetData());
   mitk::BaseGeometry* geom = img->GetGeometry();
 
   if ( geom->IsInside(m_WorldPoint) )
   {
     img->GetGeometry()->WorldToIndex(m_WorldPoint, index);
     mitk::PointSet::Pointer pointSet = mitk::PointSet::New();
     pointSet->InsertPoint(0, m_WorldPoint);
 
 
     mitk::DataStorage::SetOfObjects::ConstPointer children = GetDataStorage()->GetDerivations(m_Controls->m_SelectedImageBox->GetSelectedNode());
 
     mitk::DataNode::Pointer node = mitk::DataNode::New();
     node->SetData(pointSet);
     QString name = QString("FieldSource_%1").arg(children->size());
     node->SetName(name.toStdString());
     node->SetVisibility(true);
 
     float minSpacing;
     if(geom->GetSpacing()[0]<geom->GetSpacing()[1] && geom->GetSpacing()[0]<geom->GetSpacing()[2])
       minSpacing = geom->GetSpacing()[0];
     else if (geom->GetSpacing()[1] < geom->GetSpacing()[2])
       minSpacing = geom->GetSpacing()[1];
     else
       minSpacing = geom->GetSpacing()[2];
 
     node->SetProperty("pointsize", mitk::FloatProperty::New(minSpacing*5));
     node->SetProperty("color", mitk::ColorProperty::New(0, 0, 1));
 
     GetDataStorage()->Add(node, m_Controls->m_SelectedImageBox->GetSelectedNode());
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
 }
 
 void QmitkFieldmapGeneratorView::GenerateFieldmap()
 {
   if (m_Controls->m_SelectedImageBox->GetSelectedNode().IsNull())
     return;
 
   mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(m_Controls->m_SelectedImageBox->GetSelectedNode()->GetData());
   mitk::BaseGeometry* geom = img->GetGeometry();
 
   typedef itk::Image< double, 3 > FieldMapType;
   itk::Vector<double>                 spacing;              ///< output image spacing
   mitk::Point3D                       origin;               ///< output image origin
   itk::FieldmapGeneratorFilter< FieldMapType >::MatrixType                directionMatrix;      ///< output image rotation
   itk::FieldmapGeneratorFilter< FieldMapType >::OutputImageRegionType     imageRegion;          ///< output image size
 
   spacing = geom->GetSpacing();
   origin = geom->GetOrigin();
   imageRegion.SetSize(0, img->GetDimension(0));
   imageRegion.SetSize(1, img->GetDimension(1));
   imageRegion.SetSize(2, img->GetDimension(2));
   for (int r=0; r<3; r++)
     for (int c=0; c<3; c++)
       directionMatrix[r][c]=geom->GetMatrixColumn(c)[r]/spacing[c];
 
   std::vector< double >               variances;
   std::vector< double >               heights;
   std::vector< mitk::Point3D >        worldPositions;
 
   mitk::DataStorage::SetOfObjects::ConstPointer children = GetDataStorage()->GetDerivations(m_Controls->m_SelectedImageBox->GetSelectedNode());
   for( mitk::DataStorage::SetOfObjects::const_iterator it = children->begin(); it != children->end(); ++it )
     if(dynamic_cast<mitk::PointSet*>((*it)->GetData()))
     {
       float var = 0; (*it)->GetPropertyValue("pointsize", var); variances.push_back(var);
       float color[3]; (*it)->GetColor(color); heights.push_back(color[2]*100);
       mitk::PointSet* ps = dynamic_cast<mitk::PointSet*>((*it)->GetData());
       mitk::Point3D point;
       ps->GetPointIfExists(0, &point);
       worldPositions.push_back(point);
     }
 
   vnl_vector_fixed< double, 3 > gradient, offset;
   gradient[0] = m_Controls->m_xGradientBox->value();
   gradient[1] = m_Controls->m_yGradientBox->value();
   gradient[2] = m_Controls->m_zGradientBox->value();
   offset[0] = m_Controls->m_xOffsetBox->value();
   offset[1] = m_Controls->m_yOffsetBox->value();
   offset[2] = m_Controls->m_zOffsetBox->value();
 
   itk::FieldmapGeneratorFilter< FieldMapType >::Pointer filter = itk::FieldmapGeneratorFilter< FieldMapType >::New();
   filter->SetHeights(heights);
   filter->SetVariances(variances);
   filter->SetWorldPositions(worldPositions);
   filter->SetSpacing(spacing);
   filter->SetOrigin(origin);
   filter->SetDirectionMatrix(directionMatrix);
   filter->SetImageRegion(imageRegion);
   filter->SetGradient(gradient);
   filter->SetOffset(offset);
   filter->Update();
 
   mitk::DataNode::Pointer resultNode = mitk::DataNode::New();
   mitk::Image::Pointer image = mitk::Image::New();
   image->InitializeByItk(filter->GetOutput(0));
   image->SetVolume(filter->GetOutput(0)->GetBufferPointer());
   resultNode->SetData( image );
   resultNode->SetName(m_Controls->m_SelectedImageBox->GetSelectedNode()->GetName()+"_Fieldmap");
   GetDataStorage()->Add(resultNode);
 }
 
 void QmitkFieldmapGeneratorView::Visible()
 {
-  MITK_INFO << "BLABLA";
-  mitk::IRenderWindowPart* renderWindowPart = this->GetRenderWindowPart();
 
-  {
-    mitk::SliceNavigationController* slicer = renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController();
-    itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::Pointer command = itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::New();
-    command->SetCallbackFunction( this, &QmitkFieldmapGeneratorView::OnSliceChanged );
-    m_SliceObserverTag1 = slicer->AddObserver( mitk::SliceNavigationController::GeometrySliceEvent(nullptr, 0), command );
-  }
-
-  {
-    mitk::SliceNavigationController* slicer = renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController();
-    itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::Pointer command = itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::New();
-    command->SetCallbackFunction( this, &QmitkFieldmapGeneratorView::OnSliceChanged );
-    m_SliceObserverTag2 = slicer->AddObserver( mitk::SliceNavigationController::GeometrySliceEvent(nullptr, 0), command );
-  }
-
-  {
-    mitk::SliceNavigationController* slicer = renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController();
-    itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::Pointer command = itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::New();
-    command->SetCallbackFunction( this, &QmitkFieldmapGeneratorView::OnSliceChanged );
-    m_SliceObserverTag3 = slicer->AddObserver( mitk::SliceNavigationController::GeometrySliceEvent(nullptr, 0), command );
-  }
 }
 
 void QmitkFieldmapGeneratorView::Hidden()
 {
-  mitk::IRenderWindowPart* renderWindowPart = this->GetRenderWindowPart();
 
-  {
-    mitk::SliceNavigationController* slicer = renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController();
-    slicer->RemoveObserver( m_SliceObserverTag1 );
-  }
-
-  {
-    mitk::SliceNavigationController* slicer = renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController();
-    slicer->RemoveObserver( m_SliceObserverTag2 );
-  }
-
-  {
-    mitk::SliceNavigationController* slicer = renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController();
-    slicer->RemoveObserver( m_SliceObserverTag3 );
-  }
 }
 
 void QmitkFieldmapGeneratorView::Activated()
 {
+  m_SliceChangeListener.RenderWindowPartActivated(this->GetRenderWindowPart());
+  connect(&m_SliceChangeListener, SIGNAL(SliceChanged()), this, SLOT(OnSliceChanged()));
 }
 
 void QmitkFieldmapGeneratorView::Deactivated()
 {
 }
 
 void QmitkFieldmapGeneratorView::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*part*/, const QList<mitk::DataNode::Pointer>& nodes)
 {
   if (m_Controls->m_SelectedImageBox->GetSelectedNode().IsNotNull())
     m_Controls->m_SelectedImageBox->GetSelectedNode()->RemoveObserver( m_PropertyObserverTag );
 
   m_Controls->m_InputData->setTitle("Please Select Reference Image");
   m_SelectedSource = nullptr;
 
   // iterate selection
   for (mitk::DataNode::Pointer node: nodes)
   {
     if ( node.IsNotNull() && (dynamic_cast<mitk::PointSet*>(node->GetData())) )
     {
       m_Controls->m_SourceNameLabel->setText(node->GetName().c_str());
       m_SelectedSource = node;
       float variance = 0; node->GetPropertyValue("pointsize", variance);
       m_Controls->m_SourceVarianceBox->setValue(variance);
 
       float color[3]; node->GetColor(color);
       m_Controls->m_SourceHeightBox->setValue(color[2]*100);
     }
   }
 
   if (m_Controls->m_SelectedImageBox->GetSelectedNode().IsNotNull())
   {
-    itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::Pointer command = itk::ReceptorMemberCommand<QmitkFieldmapGeneratorView>::New();
-    command->SetCallbackFunction( this, &QmitkFieldmapGeneratorView::OnSliceChanged );
-    m_PropertyObserverTag = m_Controls->m_SelectedImageBox->GetSelectedNode()->AddObserver( itk::ModifiedEvent(), command );
-
     m_Controls->m_InputData->setTitle("Reference Image");
   }
 }
 
-void QmitkFieldmapGeneratorView::OnSliceChanged(const itk::EventObject& /*e*/)
+void QmitkFieldmapGeneratorView::OnSliceChanged()
 {
   if (m_Controls->m_SelectedImageBox->GetSelectedNode().IsNull() || !this->GetRenderWindowPart())
   {
     m_Controls->m_WorldPosLabel->setText("-");
     m_Controls->m_IndexLabel->setText("-");
     return;
   }
 
   m_WorldPoint = this->GetRenderWindowPart()->GetSelectedPosition();
   QString posSting = QString::number(m_WorldPoint[0]); posSting += ", "; posSting += QString::number(m_WorldPoint[1]); posSting += ", "; posSting += QString::number(m_WorldPoint[2]);
   m_Controls->m_WorldPosLabel->setText(posSting.toStdString().c_str());
 
   mitk::Point3D index;
   mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(m_Controls->m_SelectedImageBox->GetSelectedNode()->GetData());
 
   if ( m_Controls->m_SelectedImageBox->GetSelectedNode()->GetData()->GetGeometry()->IsInside(m_WorldPoint) )
   {
     img->GetGeometry()->WorldToIndex(m_WorldPoint, index);
     posSting = QString::number(index[0]); posSting += ", "; posSting += QString::number(index[1]); posSting += ", "; posSting += QString::number(index[2]);
     m_Controls->m_IndexLabel->setText(posSting.toStdString().c_str());
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.h b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.h
index 05cce38d7f..ca09d0b32c 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.h
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorView.h
@@ -1,84 +1,86 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef _QMITKQmitkFieldmapGeneratorView_H_INCLUDED
 #define _QMITKQmitkFieldmapGeneratorView_H_INCLUDED
 
 #include <berryISelectionListener.h>
 #include <QmitkAbstractView.h>
 #include <mitkIRenderWindowPartListener.h>
 #include "ui_QmitkFieldmapGeneratorViewControls.h"
 #include <mitkPointSet.h>
 #include <itkImage.h>
 #include "mitkILifecycleAwarePart.h"
+#include <QmitkSliceNavigationListener.h>
 
 /*!
   \brief Generate float image with artificial frequency maps used by Fiberfox. Simulates additional frequencies at (possibly multiple) positions based on 3D gaussians with the specified variance and amplitude and/or as a linear gradient in the image.
 * See "Fiberfox: Facilitating the creation of realistic white matter software phantoms" (DOI: 10.1002/mrm.25045) for details.
 */
 
 class QmitkFieldmapGeneratorView : public QmitkAbstractView, public mitk::ILifecycleAwarePart
 {
   // this is needed for all Qt objects that should have a Qt meta-object
   // (everything that derives from QObject and wants to have signal/slots)
   Q_OBJECT
 
 public:
 
   static const std::string VIEW_ID;
 
   QmitkFieldmapGeneratorView();
   virtual ~QmitkFieldmapGeneratorView();
 
   virtual void CreateQtPartControl(QWidget *parent) override;
 
   virtual void SetFocus() override;
 
   virtual void Activated() override;
   virtual void Deactivated() override;
   virtual void Visible() override;
   virtual void Hidden() override;
 
-  void OnSliceChanged(const itk::EventObject& e);
 
 protected slots:
 
   void GenerateFieldmap();
   void PlaceFieldSource();
   void OnVarianceChanged(double value);
   void OnHeightChanged(double value);
+  void OnSliceChanged();
 
 protected:
 
   /// \brief called by QmitkAbstractView when DataManager's selection has changed
   virtual void OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList<mitk::DataNode::Pointer>& nodes) override;
 
   Ui::QmitkFieldmapGeneratorViewControls* m_Controls;
 
   /** observer flags */
   int m_SliceObserverTag1;
   int m_SliceObserverTag2;
   int m_SliceObserverTag3;
   int m_PropertyObserverTag;
 
-  mitk::Point3D               m_WorldPoint;
-  mitk::DataNode::Pointer     m_SelectedSource;
+  mitk::Point3D                 m_WorldPoint;
+  mitk::DataNode::Pointer       m_SelectedSource;
+  QmitkSliceNavigationListener  m_SliceChangeListener;
 };
 
 
 
 #endif // _QmitkFieldmapGeneratorView_H_INCLUDED
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorViewControls.ui
index d665a134da..0307ff5144 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFieldmapGeneratorViewControls.ui
@@ -1,353 +1,377 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkFieldmapGeneratorViewControls</class>
  <widget class="QWidget" name="QmitkFieldmapGeneratorViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>348</width>
-    <height>511</height>
+    <width>358</width>
+    <height>536</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>6</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout_5">
    <property name="leftMargin">
     <number>9</number>
    </property>
    <property name="topMargin">
     <number>9</number>
    </property>
    <property name="rightMargin">
     <number>9</number>
    </property>
    <property name="bottomMargin">
     <number>9</number>
    </property>
-   <item>
-    <widget class="QGroupBox" name="m_InputData">
-     <property name="title">
-      <string>Please Select Reference Image</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QmitkDataStorageComboBox" name="m_SelectedImageBox"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="frame">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="3" column="0">
+    <widget class="QFrame" name="frame_2">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
+      <item row="2" column="0">
+       <widget class="QCommandLinkButton" name="m_PlaceFieldSource">
         <property name="text">
-         <string>World Coordinates:</string>
+         <string>Place Field Source</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="m_WorldPosLabel">
-        <property name="text">
-         <string>-</string>
-        </property>
+      <item row="1" column="0">
+       <widget class="QFrame" name="frame">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>World Coordinates:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLabel" name="m_WorldPosLabel">
+           <property name="text">
+            <string>-</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Index:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLabel" name="m_IndexLabel">
+           <property name="text">
+            <string>-</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
+      <item row="3" column="0">
+       <widget class="QCommandLinkButton" name="m_GenerateFieldmap">
         <property name="text">
-         <string>Index:</string>
+         <string>Generate Fieldmap</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="m_IndexLabel">
-        <property name="text">
-         <string>-</string>
-        </property>
+      <item row="0" column="0">
+       <widget class="QGroupBox" name="m_InputData">
+        <property name="title">
+         <string>Please Select Reference Image</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QmitkDataStorageComboBox" name="m_SelectedImageBox"/>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QCommandLinkButton" name="m_PlaceFieldSource">
-     <property name="text">
-      <string>Place Field Source</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCommandLinkButton" name="m_GenerateFieldmap">
-     <property name="text">
-      <string>Generate Fieldmap</string>
-     </property>
-    </widget>
-   </item>
-   <item>
+   <item row="4" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Add Gradient</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="1">
        <widget class="QLabel" name="label_10">
         <property name="text">
          <string>Gradient</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>x:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_9">
         <property name="text">
          <string>z:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QDoubleSpinBox" name="m_zGradientBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-1000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1000.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QDoubleSpinBox" name="m_xGradientBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-1000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1000.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_8">
         <property name="text">
          <string>y:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QDoubleSpinBox" name="m_yGradientBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-1000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1000.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="QLabel" name="label_11">
         <property name="text">
          <string>Offset</string>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QDoubleSpinBox" name="m_xOffsetBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-1000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1000.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="2" column="2">
        <widget class="QDoubleSpinBox" name="m_yOffsetBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-1000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1000.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="3" column="2">
        <widget class="QDoubleSpinBox" name="m_zOffsetBox">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-1000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1000.000000000000000</double>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="6" column="0">
+    <spacer name="spacer1">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>220</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Edit Selected Source</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>Name:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>Height:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Variance:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="m_SourceNameLabel">
         <property name="text">
          <string>-</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QDoubleSpinBox" name="m_SourceVarianceBox">
         <property name="maximum">
          <double>999999.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QDoubleSpinBox" name="m_SourceHeightBox">
         <property name="maximum">
          <double>999999.000000000000000</double>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="spacer1">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>220</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp
index 5e61d1afaf..d8529d2770 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp
@@ -1,52 +1,51 @@
 /*===================================================================
 
 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 "QmitkFiberProcessingPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkFiberProcessingPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
-    /////////////////////////////////////////////////////
-    // all di-app perspectives should have the following:
-    /////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////
+  // all di-app perspectives should have the following:
+  /////////////////////////////////////////////////////
 
-    QString editorArea = layout->GetEditorArea();
+  QString editorArea = layout->GetEditorArea();
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
-    layout->AddStandaloneView("org.mitk.views.datamanager",
-                              false, berry::IPageLayout::LEFT, 0.3f, editorArea);
+  layout->AddStandaloneView("org.mitk.views.datamanager",
+                            false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
-    layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
-                              false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
+  layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
+                            false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
-    berry::IFolderLayout::Pointer left =
-            layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
-                                 berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
+  berry::IFolderLayout::Pointer left =
+      layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
+                           berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
-                                         berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
+                                       berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
-    /////////////////////////////////////////////
-    // here goes the perspective specific stuff
-    /////////////////////////////////////////////
+  /////////////////////////////////////////////
+  // here goes the perspective specific stuff
+  /////////////////////////////////////////////
 
-    left->AddView("org.mitk.views.fiberprocessing");
-    left->AddView("org.mitk.views.fiberquantification");
-    left->AddView("org.mitk.views.fiberclustering");
-    left->AddView("org.mitk.views.fiberfit");
-    left->AddView("org.mitk.views.segmentation");
+  left->AddView("org.mitk.views.fiberprocessing");
+  left->AddView("org.mitk.views.fiberquantification");
+  left->AddView("org.mitk.views.fiberclustering");
+  left->AddView("org.mitk.views.fiberfit");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingViewControls.ui
index 4fe19b14aa..91638b06bf 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingViewControls.ui
@@ -1,1544 +1,1580 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkFiberProcessingViewControls</class>
  <widget class="QWidget" name="QmitkFiberProcessingViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>385</width>
     <height>684</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
    <item row="1" column="0">
     <widget class="QToolBox" name="toolBoxx">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <property name="tabSpacing">
       <number>5</number>
      </property>
      <widget class="QWidget" name="page">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>353</width>
         <height>443</height>
        </rect>
       </property>
       <attribute name="label">
        <string>Fiber Extraction</string>
       </attribute>
       <attribute name="toolTip">
        <string>Extract a fiber subset from the selected fiber bundle using manually placed planar figures as waypoints or binary regions of interest.</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_14">
        <item row="5" column="0">
         <widget class="QCommandLinkButton" name="m_ExtractFibersButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="font">
           <font>
            <pointsize>11</pointsize>
           </font>
          </property>
          <property name="toolTip">
           <string>Extract fibers passing through selected ROI or composite ROI. Select ROI and fiber bundle to execute.</string>
          </property>
          <property name="text">
           <string>Extract</string>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <spacer name="verticalSpacer_5">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="3" column="0">
         <widget class="QFrame" name="m_ExtactionFramePF">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_8">
           <property name="leftMargin">
-           <number>9</number>
+           <number>0</number>
           </property>
           <property name="topMargin">
-           <number>9</number>
+           <number>0</number>
           </property>
           <property name="rightMargin">
-           <number>9</number>
+           <number>0</number>
           </property>
           <property name="bottomMargin">
-           <number>9</number>
+           <number>0</number>
           </property>
           <property name="spacing">
-           <number>0</number>
+           <number>6</number>
           </property>
-          <item row="1" column="0">
-           <widget class="QFrame" name="m_PlanarFigureButtonsFrame_2">
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="m_InteractiveBox">
+            <property name="text">
+             <string>Interactive Extraction </string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QFrame" name="m_PlanarFigureButtonsFrame">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>200</width>
               <height>0</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
               <width>16777215</width>
               <height>60</height>
              </size>
             </property>
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_5">
+            <layout class="QGridLayout" name="gridLayout">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="0" column="1">
-              <widget class="QCommandLinkButton" name="PFCompoORButton">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
+             <item row="0" column="0">
+              <widget class="QPushButton" name="m_CircleButton">
                <property name="maximumSize">
                 <size>
-                 <width>60</width>
-                 <height>16777215</height>
+                 <width>30</width>
+                 <height>30</height>
                 </size>
                </property>
                <property name="toolTip">
-                <string>Create OR composition with selected ROIs.</string>
+                <string>Draw circular ROI. Select reference fiber bundle to execute.</string>
                </property>
                <property name="text">
-                <string>OR</string>
+                <string/>
+               </property>
+               <property name="icon">
+                <iconset resource="../../../org.mitk.gui.qt.diffusionimaging.fiberfox/resources/QmitkDiffusionImaging.qrc">
+                 <normaloff>:/QmitkDiffusionImaging/circle.png</normaloff>:/QmitkDiffusionImaging/circle.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>32</width>
+                 <height>32</height>
+                </size>
+               </property>
+               <property name="checkable">
+                <bool>false</bool>
+               </property>
+               <property name="flat">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
-             <item row="0" column="3">
-              <spacer name="horizontalSpacer_3">
+             <item row="0" column="2">
+              <spacer name="horizontalSpacer">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>40</width>
                  <height>20</height>
                 </size>
                </property>
               </spacer>
              </item>
-             <item row="0" column="2">
-              <widget class="QCommandLinkButton" name="PFCompoNOTButton">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
+             <item row="0" column="1">
+              <widget class="QPushButton" name="m_PolygonButton">
                <property name="maximumSize">
                 <size>
-                 <width>60</width>
-                 <height>16777215</height>
+                 <width>30</width>
+                 <height>30</height>
                 </size>
                </property>
                <property name="toolTip">
-                <string>Create NOT composition from selected ROI.</string>
+                <string>Draw polygonal ROI. Select reference fiber bundle to execute.</string>
                </property>
                <property name="text">
-                <string>NOT</string>
+                <string/>
                </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QCommandLinkButton" name="PFCompoANDButton">
-               <property name="enabled">
-                <bool>false</bool>
+               <property name="icon">
+                <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+                 <normaloff>:/QmitkDiffusionImaging/polygon.png</normaloff>:/QmitkDiffusionImaging/polygon.png</iconset>
                </property>
-               <property name="maximumSize">
+               <property name="iconSize">
                 <size>
-                 <width>60</width>
-                 <height>16777215</height>
+                 <width>32</width>
+                 <height>32</height>
                 </size>
                </property>
-               <property name="toolTip">
-                <string>Create AND composition with selected ROIs.</string>
+               <property name="checkable">
+                <bool>true</bool>
                </property>
-               <property name="text">
-                <string>AND</string>
+               <property name="flat">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QFrame" name="m_PlanarFigureButtonsFrame">
+          <item row="1" column="0">
+           <widget class="QFrame" name="m_PlanarFigureButtonsFrame_2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>200</width>
               <height>0</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
               <width>16777215</width>
               <height>60</height>
              </size>
             </property>
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout">
+            <layout class="QGridLayout" name="gridLayout_5">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="0" column="0">
-              <widget class="QPushButton" name="m_CircleButton">
+             <item row="0" column="2">
+              <widget class="QCommandLinkButton" name="PFCompoNOTButton">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
                <property name="maximumSize">
                 <size>
-                 <width>30</width>
-                 <height>30</height>
+                 <width>60</width>
+                 <height>16777215</height>
                 </size>
                </property>
                <property name="toolTip">
-                <string>Draw circular ROI. Select reference fiber bundle to execute.</string>
+                <string>Create NOT composition from selected ROI.</string>
                </property>
                <property name="text">
-                <string/>
+                <string>NOT</string>
                </property>
-               <property name="icon">
-                <iconset resource="../../../org.mitk.gui.qt.diffusionimaging.fiberfox/resources/QmitkDiffusionImaging.qrc">
-                 <normaloff>:/QmitkDiffusionImaging/circle.png</normaloff>:/QmitkDiffusionImaging/circle.png</iconset>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QCommandLinkButton" name="PFCompoORButton">
+               <property name="enabled">
+                <bool>false</bool>
                </property>
-               <property name="iconSize">
+               <property name="maximumSize">
                 <size>
-                 <width>32</width>
-                 <height>32</height>
+                 <width>60</width>
+                 <height>16777215</height>
                 </size>
                </property>
-               <property name="checkable">
-                <bool>false</bool>
+               <property name="toolTip">
+                <string>Create OR composition with selected ROIs.</string>
                </property>
-               <property name="flat">
-                <bool>true</bool>
+               <property name="text">
+                <string>OR</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="2">
-              <spacer name="horizontalSpacer">
+             <item row="0" column="3">
+              <spacer name="horizontalSpacer_3">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>40</width>
                  <height>20</height>
                 </size>
                </property>
               </spacer>
              </item>
-             <item row="0" column="1">
-              <widget class="QPushButton" name="m_PolygonButton">
+             <item row="0" column="0">
+              <widget class="QCommandLinkButton" name="PFCompoANDButton">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
                <property name="maximumSize">
                 <size>
-                 <width>30</width>
-                 <height>30</height>
+                 <width>60</width>
+                 <height>16777215</height>
                 </size>
                </property>
                <property name="toolTip">
-                <string>Draw polygonal ROI. Select reference fiber bundle to execute.</string>
+                <string>Create AND composition with selected ROIs.</string>
                </property>
                <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
-                 <normaloff>:/QmitkDiffusionImaging/polygon.png</normaloff>:/QmitkDiffusionImaging/polygon.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>32</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-               <property name="flat">
-                <bool>true</bool>
+                <string>AND</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QCommandLinkButton" name="m_GenerateRoiImage">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>
             <property name="font">
              <font>
               <pointsize>11</pointsize>
              </font>
             </property>
             <property name="toolTip">
              <string>Generate a binary image containing all selected ROIs. Select at least one ROI (planar figure) and a reference fiber bundle or image.</string>
             </property>
             <property name="text">
              <string>Generate ROI Image</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QCheckBox" name="m_InteractiveBox">
-            <property name="text">
-             <string>Interactive Extraction </string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QComboBox" name="m_ExtractionMethodBox">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <item>
           <property name="text">
            <string>Extract using planar figures</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Extract using ROI image</string>
           </property>
          </item>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QFrame" name="m_MaskExtractionFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_19">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="2" column="0">
            <widget class="QLabel" name="label_17">
             <property name="text">
              <string>Min. overlap:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_16">
             <property name="text">
              <string>Extract fibers:</string>
             </property>
            </widget>
           </item>
           <item row="5" column="0">
            <widget class="QCheckBox" name="m_BothEnds">
             <property name="text">
              <string>Both ends</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="2" column="2">
            <widget class="QDoubleSpinBox" name="m_FiberExtractionFractionBox">
             <property name="decimals">
              <number>3</number>
             </property>
             <property name="maximum">
              <double>1.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QComboBox" name="m_ExtractionBoxMask">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <item>
              <property name="text">
               <string>Ending in ROI</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Not ending in ROI</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Passing ROI</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Not passing ROI</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="4" column="0">
            <widget class="QCheckBox" name="m_InterpolateRoiBox">
             <property name="text">
              <string>Interpolate ROI</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_19">
             <property name="text">
              <string>Threshold:</string>
             </property>
            </widget>
           </item>
           <item row="3" column="2">
            <widget class="QDoubleSpinBox" name="m_FiberExtractionThresholdBox">
             <property name="toolTip">
              <string>Threshold on ROI image for positions to be considered as positive.</string>
             </property>
             <property name="decimals">
              <number>3</number>
             </property>
             <property name="maximum">
              <double>9999.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
             </property>
             <property name="value">
              <double>0.500000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_3">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>367</width>
         <height>408</height>
        </rect>
       </property>
       <attribute name="label">
        <string>Fiber Removal</string>
       </attribute>
       <attribute name="toolTip">
        <string>Remove fibers that satisfy certain criteria from the selected bundle.</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="3" column="0">
         <widget class="QFrame" name="m_RemoveCurvatureFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_11">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="2" column="2">
            <widget class="QCheckBox" name="m_RemoveCurvedFibersBox">
             <property name="toolTip">
              <string>If unchecked, the fiber exceeding the threshold will be split in two instead of removed.</string>
             </property>
             <property name="text">
              <string>Remove Fiber</string>
             </property>
             <property name="checked">
              <bool>false</bool>
             </property>
            </widget>
           </item>
           <item row="1" column="2">
            <widget class="QFrame" name="frame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_12">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="verticalSpacing">
               <number>0</number>
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="label_8">
                <property name="text">
                 <string>Max. Angular Deviation:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="2">
               <spacer name="horizontalSpacer_5">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>40</width>
                  <height>20</height>
                 </size>
                </property>
               </spacer>
              </item>
              <item row="0" column="1">
               <widget class="QDoubleSpinBox" name="m_CurvSpinBox">
                <property name="toolTip">
                 <string>Maximum angular deviation in degree</string>
                </property>
                <property name="maximum">
                 <double>180.000000000000000</double>
                </property>
                <property name="singleStep">
                 <double>0.100000000000000</double>
                </property>
                <property name="value">
                 <double>30.000000000000000</double>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QLabel" name="label_14">
                <property name="text">
                 <string>Distance:</string>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="QDoubleSpinBox" name="m_CurvDistanceSpinBox">
                <property name="toolTip">
                 <string>Distance in mm</string>
                </property>
                <property name="decimals">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <double>999.000000000000000</double>
                </property>
                <property name="singleStep">
                 <double>1.000000000000000</double>
                </property>
                <property name="value">
                 <double>10.000000000000000</double>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QFrame" name="m_RemoveDirectionFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <property name="horizontalSpacing">
            <number>0</number>
           </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
              <string>X:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_3">
             <property name="text">
              <string>Y:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QDoubleSpinBox" name="m_ExtractDirX"/>
           </item>
           <item row="1" column="1">
            <widget class="QDoubleSpinBox" name="m_ExtractDirY"/>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>Z:</string>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="QDoubleSpinBox" name="m_ExtractDirZ"/>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_5">
             <property name="text">
              <string>Angle:</string>
             </property>
            </widget>
           </item>
           <item row="3" column="1">
            <widget class="QDoubleSpinBox" name="m_ExtractAngle">
             <property name="toolTip">
              <string>Angular deviation threshold in degree</string>
             </property>
             <property name="decimals">
              <number>1</number>
             </property>
             <property name="maximum">
              <double>90.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>1.000000000000000</double>
             </property>
             <property name="value">
              <double>25.000000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QFrame" name="m_RemoveLengthFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="2">
            <spacer name="horizontalSpacer_4">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="m_PruneFibersMinBox">
             <property name="toolTip">
              <string>Minimum fiber length in mm</string>
             </property>
             <property name="minimum">
              <number>0</number>
             </property>
             <property name="maximum">
              <number>999999999</number>
             </property>
             <property name="value">
              <number>20</number>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_9">
             <property name="text">
              <string>Max. Length:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_7">
             <property name="text">
              <string>Min. Length:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QSpinBox" name="m_PruneFibersMaxBox">
             <property name="toolTip">
              <string>Maximum fiber length in mm</string>
             </property>
             <property name="minimum">
              <number>0</number>
             </property>
             <property name="maximum">
              <number>999999999</number>
             </property>
             <property name="value">
              <number>300</number>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="5" column="0">
         <widget class="QCommandLinkButton" name="m_RemoveButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="font">
           <font>
            <pointsize>11</pointsize>
           </font>
          </property>
          <property name="toolTip">
           <string/>
          </property>
          <property name="text">
           <string>Remove</string>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="0">
         <widget class="QComboBox" name="m_RemovalMethodBox">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <item>
           <property name="text">
            <string>Remove fibers in direction</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Remove fibers by length</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Remove fibers by curvature</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Remove fiber parts outside mask</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Remove fiber parts inside mask</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Remove fibers by weight</string>
           </property>
          </item>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QFrame" name="m_RemoveByWeightFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_20">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <property name="spacing">
            <number>0</number>
           </property>
           <item row="1" column="0">
            <widget class="QLabel" name="label_18">
             <property name="text">
              <string>Weight threshold:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QDoubleSpinBox" name="m_WeightThresholdBox">
             <property name="toolTip">
              <string>Only fibers with weight larger than this threshold are kept.</string>
             </property>
             <property name="decimals">
              <number>5</number>
             </property>
             <property name="maximum">
              <double>99999.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_4">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>367</width>
         <height>408</height>
        </rect>
       </property>
       <attribute name="label">
        <string>Bundle Modification</string>
       </attribute>
       <attribute name="toolTip">
        <string>Modify the selected bundle with operations such as fiber resampling, FA coloring, etc.</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_10">
        <item row="2" column="0">
         <widget class="QFrame" name="m_CompressFibersFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_15">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
-          <property name="spacing">
+          <property name="horizontalSpacing">
            <number>0</number>
           </property>
+          <property name="verticalSpacing">
+           <number>6</number>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_10">
             <property name="text">
              <string>Error threshold in mm:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QDoubleSpinBox" name="m_ErrorThresholdBox">
             <property name="maximum">
              <double>999999999.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
             </property>
             <property name="value">
              <double>0.100000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QFrame" name="m_MirrorFibersFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_17">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
-          <property name="spacing">
+          <property name="horizontalSpacing">
            <number>0</number>
           </property>
+          <property name="verticalSpacing">
+           <number>6</number>
+          </property>
           <item row="1" column="0">
            <widget class="QComboBox" name="m_MirrorFibersBox">
             <item>
              <property name="text">
               <string>Sagittal</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Coronal</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Axial</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_13">
             <property name="text">
              <string>Select direction:</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QFrame" name="m_ColorFibersFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_16">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
-          <property name="spacing">
+          <property name="horizontalSpacing">
            <number>0</number>
           </property>
+          <property name="verticalSpacing">
+           <number>6</number>
+          </property>
           <item row="1" column="0">
            <widget class="QCheckBox" name="m_FiberOpacityBox">
             <property name="toolTip">
              <string>If checked, the image values are not only used to color the fibers but are also used as opaxity values.</string>
             </property>
             <property name="text">
              <string>Values as opacity</string>
             </property>
             <property name="checked">
              <bool>false</bool>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QmitkDataStorageComboBox" name="m_ColorMapBox"/>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_12">
             <property name="text">
              <string>Scalar map:</string>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QCheckBox" name="m_NormalizeColorValues">
             <property name="toolTip">
              <string>The values used to color the fibers are min-max normalized. If not checked, the values should be between 0 and 1. </string>
             </property>
             <property name="text">
              <string>Normalize values</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QComboBox" name="m_ModificationMethodBox">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <item>
           <property name="text">
            <string>Resample fibers (spline)</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Resample fibers (linear)</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Compress fibers</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Color fibers by scalar map (e.g. FA)</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Mirror fibers</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Weight bundle</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Color fibers by curvature</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Color fibers by fiber weights</string>
           </property>
          </item>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QFrame" name="m_SmoothFibersFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_7">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
-          <property name="spacing">
+          <property name="horizontalSpacing">
            <number>0</number>
           </property>
+          <property name="verticalSpacing">
+           <number>6</number>
+          </property>
           <item row="1" column="0">
            <widget class="QDoubleSpinBox" name="m_SmoothFibersBox">
             <property name="minimum">
              <double>0.010000000000000</double>
             </property>
             <property name="maximum">
              <double>999999999.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
             </property>
             <property name="value">
              <double>1.000000000000000</double>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
              <string>Point distance in mm:</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="7" column="0">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="6" column="0">
         <widget class="QCommandLinkButton" name="m_ModifyButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="font">
           <font>
            <pointsize>11</pointsize>
           </font>
          </property>
          <property name="toolTip">
           <string/>
          </property>
          <property name="text">
           <string>Execute</string>
          </property>
         </widget>
        </item>
        <item row="5" column="0">
         <widget class="QFrame" name="m_BundleWeightFrame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_18">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <property name="spacing">
            <number>0</number>
           </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_15">
             <property name="text">
              <string>Weight:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QDoubleSpinBox" name="m_BundleWeightBox">
             <property name="decimals">
              <number>7</number>
             </property>
             <property name="maximum">
              <double>999999999.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
             </property>
             <property name="value">
              <double>1.000000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_2">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>367</width>
         <height>165</height>
        </rect>
       </property>
       <attribute name="label">
        <string>Bundle Operations</string>
       </attribute>
       <attribute name="toolTip">
        <string>Join, subtract or copy bundles.</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_13">
        <item row="0" column="0">
         <widget class="QCommandLinkButton" name="m_SubstractBundles">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="font">
           <font>
            <pointsize>11</pointsize>
           </font>
          </property>
          <property name="toolTip">
           <string>Returns all fibers contained in bundle X that are not contained in bundle Y (not commutative!). Select at least two fiber bundles to execute.</string>
          </property>
          <property name="text">
           <string>Substract</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="2">
         <widget class="QCommandLinkButton" name="m_JoinBundles">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="font">
           <font>
            <pointsize>11</pointsize>
           </font>
          </property>
          <property name="toolTip">
           <string>Merge selected fiber bundles. Select at least two fiber bundles to execute.</string>
          </property>
          <property name="text">
           <string>Join</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QCommandLinkButton" name="m_CopyBundle">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="font">
           <font>
            <pointsize>11</pointsize>
           </font>
          </property>
          <property name="toolTip">
           <string>Merge selected fiber bundles. Select at least two fiber bundles to execute.</string>
          </property>
          <property name="text">
           <string>Copy</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="m_InputData">
      <property name="title">
       <string>Please Select Input Data</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_9">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item row="0" column="1">
        <widget class="QLabel" name="m_FibLabel">
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;mandatory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="m_PfLabel">
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#969696;&quot;&gt;needed for extraction&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="toolTip">
          <string>Input DTI</string>
         </property>
         <property name="text">
          <string>Fiber Bundle:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_6">
         <property name="toolTip">
          <string>Binary seed ROI. If not specified, the whole image area is seeded.</string>
         </property>
         <property name="text">
          <string>ROI:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../org.mitk.gui.qt.diffusionimaging.fiberfox/resources/QmitkDiffusionImaging.qrc"/>
   <include location="../../resources/QmitkDiffusionImaging.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationViewControls.ui
index 399ba8db30..d5cac10364 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationViewControls.ui
@@ -1,357 +1,381 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkFiberQuantificationViewControls</class>
  <widget class="QWidget" name="QmitkFiberQuantificationViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>484</width>
-    <height>574</height>
+    <width>365</width>
+    <height>565</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_10">
-   <item row="3" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Fiber-derived images</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
       </property>
-      <item row="4" column="0">
+      <item row="1" column="0">
        <widget class="QCommandLinkButton" name="m_ProcessFiberBundleButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize">
          <size>
           <width>200</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="font">
          <font>
           <pointsize>11</pointsize>
          </font>
         </property>
         <property name="toolTip">
          <string>Perform selected operation on all selected fiber bundles.</string>
         </property>
         <property name="text">
          <string>Generate Image</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QFrame" name="frame_4">
+      <item row="0" column="1">
+       <widget class="QDoubleSpinBox" name="m_UpsamplingSpinBox">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="toolTip">
+         <string>Upsampling factor</string>
+        </property>
+        <property name="decimals">
+         <number>1</number>
+        </property>
+        <property name="minimum">
+         <double>0.100000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>10.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.100000000000000</double>
+        </property>
+        <property name="value">
+         <double>1.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QComboBox" name="m_GenerationBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name="text">
+          <string>Tract Density Image (TDI)</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Normalized TDI</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Binary Envelope</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Fiber Bundle Image</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Fiber Endings Image</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Fiber Endings Pointset</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Fiber Statistics</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QTextEdit" name="m_StatsTextEdit">
+        <property name="font">
+         <font>
+          <family>Courier 10 Pitch</family>
+         </font>
+        </property>
+        <property name="acceptDrops">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>Principal Fiber Directions</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_6">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QFrame" name="frame_2">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <property name="lineWidth">
-         <number>0</number>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_8">
+        <layout class="QGridLayout" name="gridLayout_5">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <property name="verticalSpacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QComboBox" name="m_GenerationBox">
+         <item row="1" column="1">
+          <widget class="QDoubleSpinBox" name="m_AngularThreshold">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <item>
-            <property name="text">
-             <string>Tract Density Image (TDI)</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Normalized TDI</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Binary Envelope</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Fiber Bundle Image</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Fiber Endings Image</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Fiber Endings Pointset</string>
-            </property>
-           </item>
+           <property name="toolTip">
+            <string>Fiber directions with an angle smaller than the defined threshold are clustered.</string>
+           </property>
+           <property name="decimals">
+            <number>2</number>
+           </property>
+           <property name="minimum">
+            <double>0.000000000000000</double>
+           </property>
+           <property name="maximum">
+            <double>90.000000000000000</double>
+           </property>
+           <property name="singleStep">
+            <double>1.000000000000000</double>
+           </property>
+           <property name="value">
+            <double>30.000000000000000</double>
+           </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QDoubleSpinBox" name="m_UpsamplingSpinBox">
+         <item row="2" column="1">
+          <widget class="QDoubleSpinBox" name="m_PeakThreshold">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="toolTip">
-            <string>Upsampling factor</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Directions shorter than the defined threshold are discarded.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="decimals">
-            <number>1</number>
-           </property>
-           <property name="minimum">
-            <double>0.100000000000000</double>
+            <number>3</number>
            </property>
            <property name="maximum">
-            <double>10.000000000000000</double>
+            <double>1.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.100000000000000</double>
            </property>
            <property name="value">
-            <double>1.000000000000000</double>
+            <double>0.300000000000000</double>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Angular Threshold:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Max. clusters:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Size Threshold:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="m_MaxNumDirections">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolTip">
+            <string>Maximum number of fiber directions per voxel.</string>
+           </property>
+           <property name="maximum">
+            <number>100</number>
+           </property>
+           <property name="value">
+            <number>3</number>
            </property>
           </widget>
          </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>Normalization:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QComboBox" name="m_FiberDirNormBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <item>
+            <property name="text">
+             <string>Global maximum</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Single vector</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Voxel-wise maximum</string>
+            </property>
+           </item>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="title">
-      <string>Fiber Statistics</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QTextEdit" name="m_StatsTextEdit">
-        <property name="font">
-         <font>
-          <family>Courier 10 Pitch</family>
-         </font>
-        </property>
-        <property name="acceptDrops">
-         <bool>false</bool>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Principal Fiber Directions</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="m_MaxNumDirections">
-        <property name="toolTip">
-         <string>Maximum number of fiber directions per voxel.</string>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="value">
-         <number>3</number>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
+      <item row="1" column="0">
        <widget class="QCheckBox" name="m_NumDirectionsBox">
-        <property name="toolTip">
-         <string>Image containing the number of distinct fiber clusters per voxel.</string>
-        </property>
-        <property name="text">
-         <string>Output #Directions per Voxel</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QCommandLinkButton" name="m_ExtractFiberPeaks">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>200</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>11</pointsize>
-         </font>
-        </property>
         <property name="toolTip">
-         <string/>
+         <string>Image containing the number of distinct fiber clusters per voxel.</string>
         </property>
         <property name="text">
-         <string>Start</string>
+         <string>Output #Directions per Voxel</string>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Max. clusters:</string>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Size Threshold:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Angular Threshold:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QDoubleSpinBox" name="m_PeakThreshold">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Directions shorter than the defined threshold are discarded.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="decimals">
-         <number>3</number>
-        </property>
-        <property name="maximum">
-         <double>1.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.100000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.300000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QDoubleSpinBox" name="m_AngularThreshold">
-        <property name="toolTip">
-         <string>Fiber directions with an angle smaller than the defined threshold are clustered.</string>
-        </property>
-        <property name="decimals">
-         <number>2</number>
-        </property>
-        <property name="minimum">
-         <double>0.000000000000000</double>
-        </property>
-        <property name="maximum">
-         <double>90.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>1.000000000000000</double>
-        </property>
-        <property name="value">
-         <double>30.000000000000000</double>
+       <widget class="QCommandLinkButton" name="m_ExtractFiberPeaks">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>Normalization:</string>
+         <string>Generate Directions</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QComboBox" name="m_FiberDirNormBox">
-        <item>
-         <property name="text">
-          <string>Global maximum</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Single vector</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Voxel-wise maximum</string>
-         </property>
-        </item>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/Perspectives/QmitkDIAppIVIMPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/Perspectives/QmitkDIAppIVIMPerspective.cpp
index 0c8192235f..a5c930c5e2 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/Perspectives/QmitkDIAppIVIMPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/Perspectives/QmitkDIAppIVIMPerspective.cpp
@@ -1,51 +1,46 @@
 /*===================================================================
 
 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 "QmitkDIAppIVIMPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppIVIMPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
-    /////////////////////////////////////////////////////
-    // all di-app perspectives should have the following:
-    /////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////
+  // all di-app perspectives should have the following:
+  /////////////////////////////////////////////////////
 
-    QString editorArea = layout->GetEditorArea();
+  QString editorArea = layout->GetEditorArea();
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
-    layout->AddStandaloneView("org.mitk.views.datamanager", false, berry::IPageLayout::LEFT, 0.3f, editorArea);
+  layout->AddStandaloneView("org.mitk.views.datamanager", false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
-    layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview", false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
+  layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview", false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
-    berry::IFolderLayout::Pointer left =
-            layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols", berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
+  berry::IFolderLayout::Pointer left =
+      layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols", berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator", berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator", berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
-    /////////////////////////////////////////////
-    // here goes the perspective specific stuff
-    /////////////////////////////////////////////
+  /////////////////////////////////////////////
+  // here goes the perspective specific stuff
+  /////////////////////////////////////////////
 
-    left->AddView("org.mitk.views.ivim");
-    berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.ivim");
-
-
-    left->AddView("org.mitk.views.segmentation");
-    lo = layout->GetViewLayout("org.mitk.views.segmentation");
-    left->AddView("org.mitk.views.diffusionquantification");
-    left->AddView("org.mitk.views.diffusionpreprocessing");
+  left->AddView("org.mitk.views.ivim");
+  left->AddView("org.mitk.views.segmentation");
+  left->AddView("org.mitk.views.imagestatistics");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/QmitkIVIMViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/QmitkIVIMViewControls.ui
index 19a73a338d..1da4ca83fa 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/QmitkIVIMViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/QmitkIVIMViewControls.ui
@@ -1,1158 +1,1185 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkIVIMViewControls</class>
  <widget class="QWidget" name="QmitkIVIMViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>423</width>
     <height>1563</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QGridLayout" name="gridLayout_11">
    <property name="leftMargin">
     <number>9</number>
    </property>
    <property name="topMargin">
     <number>9</number>
    </property>
    <property name="rightMargin">
     <number>9</number>
    </property>
    <property name="bottomMargin">
     <number>9</number>
    </property>
-   <item>
+   <property name="verticalSpacing">
+    <number>9</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Intra Voxel Incoherent Motion Estimation</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>9</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="m_InputData">
      <property name="title">
       <string>Please Select Input Data</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item row="1" column="0">
        <widget class="QLabel" name="label_8">
         <property name="toolTip">
          <string>Optional ROI image</string>
         </property>
         <property name="text">
          <string>ROI:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="m_DiffusionImageLabel">
         <property name="toolTip">
          <string>DWI to analyze</string>
         </property>
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;mandatory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="m_MaskImageLabel">
         <property name="toolTip">
          <string>Optional ROI image</string>
         </property>
         <property name="styleSheet">
          <string notr="true"/>
         </property>
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#969696;&quot;&gt;optional&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label_7">
         <property name="toolTip">
          <string>DWI to analyze</string>
         </property>
         <property name="text">
          <string>Raw DWI:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QFrame" name="m_ControlsFrame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_13">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
-       <widget class="QFrame" name="dstar">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="thres">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="thres_2">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-        </layout>
-       </widget>
-      </item>
-      <item>
+      <item row="0" column="0">
        <widget class="QLabel" name="m_Warning">
         <property name="styleSheet">
          <string notr="true"/>
         </property>
         <property name="text">
          <string>warning display</string>
         </property>
         <property name="textFormat">
          <enum>Qt::RichText</enum>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
+     <widget class="QFrame" name="dstar">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>16</width>
+        <height>16</height>
+       </rect>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </widget>
+     <widget class="QFrame" name="thres">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>16</width>
+        <height>16</height>
+       </rect>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </widget>
+     <widget class="QFrame" name="thres_2">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>16</width>
+        <height>16</height>
+       </rect>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </widget>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QFrame" name="m_FigureWidgetFrame">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_8">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_14">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QTabWidget" name="m_ModelTabSelectionWidget">
         <property name="currentIndex">
          <number>0</number>
         </property>
         <widget class="QWidget" name="m_IVIMTab">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <attribute name="title">
           <string>IVIM</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_9">
           <item>
            <widget class="QGroupBox" name="groupBox_3">
             <property name="title">
              <string>Parameters</string>
             </property>
             <layout class="QGridLayout" name="gridLayout_2">
              <property name="spacing">
               <number>9</number>
              </property>
              <item row="0" column="0">
               <widget class="QFrame" name="m_DstarFrame">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Raised</enum>
                </property>
                <layout class="QGridLayout" name="gridLayout_7">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
                 <property name="spacing">
                  <number>0</number>
                 </property>
                 <item row="0" column="0">
                  <widget class="QLabel" name="label_2">
                   <property name="maximumSize">
                    <size>
                     <width>80</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>D*</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
                  <widget class="QScrollBar" name="m_DStarSlider">
                   <property name="maximum">
                    <number>100</number>
                   </property>
                   <property name="value">
                    <number>60</number>
                   </property>
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="2">
                  <widget class="QLabel" name="m_DStarLabel">
                   <property name="maximumSize">
                    <size>
                     <width>51</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>200</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QFrame" name="m_NeglBframe">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Raised</enum>
                </property>
                <layout class="QGridLayout" name="gridLayout_8">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
                 <property name="spacing">
                  <number>0</number>
                 </property>
                 <item row="0" column="0">
                  <widget class="QLabel" name="label_3">
                   <property name="maximumSize">
                    <size>
                     <width>80</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>neglect b&lt;</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
                  <widget class="QScrollBar" name="m_BThreshSlider">
                   <property name="toolTip">
                    <string/>
                   </property>
                   <property name="maximum">
                    <number>250</number>
                   </property>
                   <property name="value">
                    <number>34</number>
                   </property>
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="2">
                  <widget class="QLabel" name="m_BThreshLabel">
                   <property name="maximumSize">
                    <size>
                     <width>51</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>46.5</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
              <item row="3" column="0">
               <widget class="QFrame" name="m_IterationsFrame">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Raised</enum>
                </property>
                <layout class="QGridLayout" name="gridLayout_6">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
                 <property name="spacing">
                  <number>0</number>
                 </property>
                 <item row="0" column="0">
                  <widget class="QLabel" name="label_5">
                   <property name="maximumSize">
                    <size>
                     <width>80</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>#iterations</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
                  <widget class="QScrollBar" name="m_NumItSlider">
                   <property name="maximum">
                    <number>100</number>
                   </property>
                   <property name="value">
                    <number>10</number>
                   </property>
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="2">
                  <widget class="QLabel" name="m_NumItsLabel">
                   <property name="maximumSize">
                    <size>
                     <width>30</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>TextLabel</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
              <item row="4" column="0">
               <widget class="QFrame" name="m_LambdaFrame">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Raised</enum>
                </property>
                <layout class="QGridLayout" name="gridLayout_10">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
                 <property name="spacing">
                  <number>0</number>
                 </property>
                 <item row="0" column="0">
                  <widget class="QLabel" name="label_6">
                   <property name="maximumSize">
                    <size>
                     <width>80</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>lambda</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
                  <widget class="QScrollBar" name="m_LambdaSlider">
                   <property name="maximum">
                    <number>1000</number>
                   </property>
                   <property name="value">
                    <number>10</number>
                   </property>
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="2">
                  <widget class="QFrame" name="frame_5">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="frameShape">
                    <enum>QFrame::NoFrame</enum>
                   </property>
                   <property name="frameShadow">
                    <enum>QFrame::Raised</enum>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_4">
                    <property name="leftMargin">
                     <number>0</number>
                    </property>
                    <property name="topMargin">
                     <number>0</number>
                    </property>
                    <property name="rightMargin">
                     <number>0</number>
                    </property>
                    <property name="bottomMargin">
                     <number>0</number>
                    </property>
                    <property name="spacing">
                     <number>0</number>
                    </property>
                    <item row="0" column="0">
                     <widget class="QLabel" name="m_LambdaLabel">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                        <horstretch>0</horstretch>
                        <verstretch>0</verstretch>
                       </sizepolicy>
                      </property>
                      <property name="maximumSize">
                       <size>
                        <width>30</width>
                        <height>16777215</height>
                       </size>
                      </property>
                      <property name="text">
                       <string>TextLabel</string>
                      </property>
                      <property name="alignment">
                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                      </property>
                     </widget>
                    </item>
                    <item row="0" column="1">
                     <widget class="QToolButton" name="m_ButtonAutoThres_3">
                      <property name="maximumSize">
                       <size>
                        <width>15</width>
                        <height>16777215</height>
                       </size>
                      </property>
                      <property name="toolTip">
                       <string>Calculate threshold from histogram</string>
                      </property>
                      <property name="text">
                       <string>*</string>
                      </property>
                     </widget>
                    </item>
                   </layout>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
              <item row="2" column="0">
               <widget class="QFrame" name="m_NeglSiFrame">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Plain</enum>
                </property>
                <layout class="QGridLayout" name="gridLayout_9">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
                 <property name="spacing">
                  <number>0</number>
                 </property>
                 <item row="0" column="0">
                  <widget class="QLabel" name="label_4">
                   <property name="maximumSize">
                    <size>
                     <width>80</width>
                     <height>16777215</height>
                    </size>
                   </property>
                   <property name="text">
                    <string>neglect Si&lt;</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
                  <widget class="QScrollBar" name="m_S0ThreshSlider">
                   <property name="maximum">
                    <number>100</number>
                   </property>
                   <property name="value">
                    <number>0</number>
                   </property>
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="2">
                  <widget class="QFrame" name="frame_2">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="frameShape">
                    <enum>QFrame::NoFrame</enum>
                   </property>
                   <property name="frameShadow">
                    <enum>QFrame::Raised</enum>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_3">
                    <property name="leftMargin">
                     <number>0</number>
                    </property>
                    <property name="topMargin">
                     <number>0</number>
                    </property>
                    <property name="rightMargin">
                     <number>0</number>
                    </property>
                    <property name="bottomMargin">
                     <number>0</number>
                    </property>
                    <property name="spacing">
                     <number>0</number>
                    </property>
                    <item row="0" column="0">
                     <widget class="QLabel" name="m_S0ThreshLabel">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                        <horstretch>0</horstretch>
                        <verstretch>0</verstretch>
                       </sizepolicy>
                      </property>
                      <property name="maximumSize">
                       <size>
                        <width>30</width>
                        <height>16777215</height>
                       </size>
                      </property>
                      <property name="text">
                       <string>TextLabel</string>
                      </property>
                      <property name="alignment">
                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                      </property>
                     </widget>
                    </item>
                    <item row="0" column="1">
                     <widget class="QToolButton" name="m_ButtonAutoThres">
                      <property name="maximumSize">
                       <size>
                        <width>15</width>
                        <height>16777215</height>
                       </size>
                      </property>
                      <property name="toolTip">
                       <string>Calculate threshold from histogram</string>
                      </property>
                      <property name="text">
                       <string>*</string>
                      </property>
                     </widget>
                    </item>
                   </layout>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <widget class="QFrame" name="frame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_4">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item>
               <widget class="QLabel" name="label">
                <property name="minimumSize">
                 <size>
                  <width>80</width>
                  <height>0</height>
                 </size>
                </property>
                <property name="text">
                 <string>Output Images</string>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QCheckBox" name="m_Checkf">
                <property name="text">
                 <string>f</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QCheckBox" name="m_CheckD">
                <property name="text">
                 <string>D</string>
                </property>
                <property name="checked">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QCheckBox" name="m_CheckDStar">
                <property name="text">
                 <string>D*</string>
                </property>
                <property name="checked">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <widget class="QmitkIVIMWidget" name="m_VisualizeResultsWidget" native="true">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>0</width>
               <height>400</height>
              </size>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_3">
             <item>
              <widget class="QCheckBox" name="m_ChooseMethod">
               <property name="text">
                <string>Choose Method</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QComboBox" name="m_MethodCombo">
               <property name="currentIndex">
                <number>2</number>
               </property>
               <item>
                <property name="text">
                 <string>3 Param. Fit</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Fit D &amp; f with fixed D* value</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Fit D &amp; f (high b), then fit D*</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Linearly fit D &amp; f (high b), then fit D*</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Regularized</string>
                </property>
               </item>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
         <widget class="QWidget" name="m_KurtosisTab">
          <attribute name="title">
           <string>Kurtosis</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_10">
           <item>
            <widget class="QFrame" name="frame_6">
             <property name="frameShape">
              <enum>QFrame::StyledPanel</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <property name="lineWidth">
              <number>2</number>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_6">
              <property name="leftMargin">
               <number>2</number>
              </property>
              <property name="topMargin">
               <number>2</number>
              </property>
              <property name="rightMargin">
               <number>2</number>
              </property>
              <property name="bottomMargin">
               <number>2</number>
              </property>
              <item>
               <layout class="QGridLayout" name="gridLayout_5">
                <item row="8" column="0">
                 <widget class="QLabel" name="label_10">
                  <property name="text">
                   <string>Smoothing sigma</string>
                  </property>
                 </widget>
                </item>
                <item row="10" column="0">
                 <widget class="QLabel" name="label_12">
                  <property name="text">
                   <string>Select Fit Type</string>
                  </property>
                 </widget>
                </item>
                <item row="6" column="2">
                 <widget class="QCheckBox" name="m_OmitBZeroCB">
                  <property name="text">
                   <string>Omit b=0 Measurement</string>
                  </property>
                 </widget>
                </item>
                <item row="7" column="0">
                 <widget class="QLabel" name="label_9">
                  <property name="minimumSize">
                   <size>
                    <width>80</width>
                    <height>0</height>
                   </size>
                  </property>
                  <property name="text">
                   <string>Output Images</string>
                  </property>
                 </widget>
                </item>
                <item row="9" column="0">
                 <widget class="QLabel" name="label_11">
                  <property name="toolTip">
                   <string>Force the fitting of K to remain within the given boundaries</string>
                  </property>
                  <property name="text">
                   <string>Boundaries for K</string>
                  </property>
                 </widget>
                </item>
                <item row="10" column="2">
                 <widget class="QComboBox" name="m_KurtosisFitScale">
                  <property name="toolTip">
                   <string>Select if the data is fitted directly (straight) or the logarithmic equation is used</string>
                  </property>
                  <item>
                   <property name="text">
                    <string>Straight Fit</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string>Logarithmic Fit</string>
                   </property>
                  </item>
                 </widget>
                </item>
                <item row="7" column="2">
                 <layout class="QHBoxLayout" name="horizontalLayout_5">
                  <property name="spacing">
                   <number>2</number>
                  </property>
                  <property name="sizeConstraint">
                   <enum>QLayout::SetMaximumSize</enum>
                  </property>
                  <item>
                   <widget class="QCheckBox" name="m_CheckKurtD">
                    <property name="text">
                     <string>D</string>
                    </property>
                    <property name="checked">
                     <bool>false</bool>
                    </property>
                   </widget>
                  </item>
                  <item>
                   <widget class="QCheckBox" name="m_CheckKurtK">
                    <property name="text">
                     <string>K</string>
                    </property>
                    <property name="checked">
                     <bool>true</bool>
                    </property>
                   </widget>
                  </item>
                 </layout>
                </item>
                <item row="9" column="2">
                 <widget class="ctkRangeWidget" name="m_KurtosisRangeWidget" native="true"/>
                </item>
                <item row="8" column="2">
                 <widget class="QDoubleSpinBox" name="m_SigmaSpinBox">
                  <property name="toolTip">
                   <string>Signa for gaussian smoothing applied prior to map computation</string>
                  </property>
                  <property name="minimum">
                   <double>0.000000000000000</double>
                  </property>
                  <property name="maximum">
                   <double>5.000000000000000</double>
                  </property>
                  <property name="singleStep">
                   <double>0.100000000000000</double>
                  </property>
                 </widget>
                </item>
                <item row="9" column="1">
                 <widget class="QCheckBox" name="m_UseKurtosisBoundsCB">
                  <property name="text">
                   <string>On</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <widget class="QmitkKurtosisWidget" name="m_KurtosisVisualizationWidget" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>0</width>
               <height>400</height>
              </size>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <widget class="QCommandLinkButton" name="m_ButtonStart">
      <property name="text">
       <string>Generate Output Images</string>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0">
     <widget class="QFrame" name="frame_3">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_7">
+     <layout class="QGridLayout" name="gridLayout_12">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QFrame" name="m_BottomControlsFrame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_6">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
           <widget class="QFrame" name="frame_4">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <property name="leftMargin">
              <number>0</number>
             </property>
             <property name="topMargin">
              <number>0</number>
             </property>
             <property name="rightMargin">
              <number>0</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
             </property>
             <item>
              <widget class="QPushButton" name="m_CurveClipboard">
               <property name="text">
                <string>Datapoints to Clipboard</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="m_ValuesClipboard">
            <property name="text">
             <string>Parameters to Clipboard</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkIVIMWidget</class>
    <extends>QWidget</extends>
    <header>QmitkIVIMWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkKurtosisWidget</class>
    <extends>QWidget</extends>
    <header>QmitkKurtosisWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>ctkRangeWidget</class>
    <extends>QWidget</extends>
    <header>ctkRangeWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionViewControls.ui
index 120ad88742..4a404eae71 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionViewControls.ui
@@ -1,435 +1,462 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkOdfMaximaExtractionViewControls</class>
  <widget class="QWidget" name="QmitkOdfMaximaExtractionViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>397</width>
     <height>848</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="2" column="0">
-    <widget class="QCommandLinkButton" name="m_ImportShCoeffs">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="toolTip">
-      <string>Generate ODF image and MITK compatible SH coefficient from other toolkits.</string>
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="1" column="0">
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="text">
-      <string>Start SH Coefficient Import</string>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
+     <layout class="QGridLayout" name="gridLayout_7">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="2" column="0">
+       <widget class="QCommandLinkButton" name="m_ImportShCoeffs">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="toolTip">
+         <string>Generate ODF image and MITK compatible SH coefficient from other toolkits.</string>
+        </property>
+        <property name="text">
+         <string>Start SH Coefficient Import</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCommandLinkButton" name="m_StartPeakExtractionButton">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="toolTip">
+         <string>Extract ODF peaks using finite differences on the densely sampled ODF surface.</string>
+        </property>
+        <property name="text">
+         <string>Start Peak Extraction</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QGroupBox" name="m_InputData">
+        <property name="title">
+         <string>Please Select Input Data</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_5">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_4">
+           <property name="toolTip">
+            <string>Select a tensor image or a SH coefficient image (generate using Q-Ball reconstruction view).</string>
+           </property>
+           <property name="text">
+            <string>ShCoeff/DTI:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Mask Image:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_ImageBox"/>
+         </item>
+         <item row="1" column="1">
+          <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_MaskBox"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="16" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>259</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Additional Output</string>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
       </property>
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QCheckBox" name="m_OutputNumDirectionsBox">
         <property name="toolTip">
          <string>Output unsigned char image containing the number of directions per voxel.</string>
         </property>
         <property name="text">
          <string>#Peaks per Voxel</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="7" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Parameters</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QFrame" name="frame_2">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_4">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <property name="horizontalSpacing">
           <number>6</number>
          </property>
          <item row="2" column="0">
           <widget class="QLabel" name="label_8">
            <property name="text">
             <string>Vector Normalization:</string>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QComboBox" name="m_NormalizationBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The vector fields are always coorected for image spacing and using the lagest eigenvalue in case of the tensor peak extraction. This is done for visualizytion purposes. The output direction images are not affected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="currentIndex">
             <number>1</number>
            </property>
            <item>
             <property name="text">
              <string>No Normalization</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>MAX Normalize</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Single Vec Normalization</string>
             </property>
            </item>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QFrame" name="m_CoeffImageFrame">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <property name="horizontalSpacing">
           <number>6</number>
          </property>
          <item row="2" column="0">
           <widget class="QLabel" name="label_5">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="text">
             <string>Max. Peaks:</string>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>Relative Threshold:</string>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QDoubleSpinBox" name="m_PeakThresholdBox">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="toolTip">
             <string>Peak threshold relative to the largest peak per voxel.</string>
            </property>
            <property name="decimals">
             <number>3</number>
            </property>
            <property name="minimum">
             <double>0.000000000000000</double>
            </property>
            <property name="maximum">
             <double>1.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.100000000000000</double>
            </property>
            <property name="value">
             <double>0.500000000000000</double>
            </property>
           </widget>
          </item>
          <item row="4" column="1">
           <widget class="QDoubleSpinBox" name="m_AbsoluteThresholdBox">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="toolTip">
             <string>Absolute peak threshold (only used for the finite differences method). The value is additionally scaled by 1/GFA.</string>
            </property>
            <property name="decimals">
             <number>3</number>
            </property>
            <property name="minimum">
             <double>0.000000000000000</double>
            </property>
            <property name="maximum">
             <double>1.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.010000000000000</double>
            </property>
            <property name="value">
             <double>0.030000000000000</double>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QSpinBox" name="m_MaxNumPeaksBox">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="toolTip">
             <string>Maximum number of peaks to extract.</string>
            </property>
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="maximum">
             <number>1000</number>
            </property>
            <property name="value">
             <number>3</number>
            </property>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_10">
            <property name="text">
             <string>Clustering Angle:</string>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="QSpinBox" name="m_ClusteringAngleBox">
            <property name="toolTip">
             <string>Cluster close directions. Define &quot;close&quot; here.</string>
            </property>
            <property name="maximum">
             <number>90</number>
            </property>
            <property name="value">
             <number>30</number>
            </property>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_7">
            <property name="text">
             <string>Absolute Threshold:</string>
            </property>
           </widget>
          </item>
          <item row="6" column="0">
           <widget class="QLabel" name="label_11">
            <property name="text">
             <string>Angular Threshold:</string>
            </property>
           </widget>
          </item>
          <item row="6" column="1">
           <widget class="QSpinBox" name="m_AngularThreshold">
            <property name="toolTip">
             <string>Discard smaller peaks in the defined angle around the maximum peaks that were too far away to be clustered.</string>
            </property>
            <property name="minimum">
             <number>0</number>
            </property>
            <property name="maximum">
             <number>90</number>
            </property>
            <property name="value">
             <number>0</number>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="m_InputData">
-     <property name="title">
-      <string>Please Select Input Data</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_5">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="toolTip">
-         <string>Select a tensor image or a SH coefficient image (generate using Q-Ball reconstruction view).</string>
-        </property>
-        <property name="text">
-         <string>ShCoeff/DTI:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Mask Image:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_ImageBox"/>
-      </item>
-      <item row="1" column="1">
-       <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_MaskBox"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QCommandLinkButton" name="m_StartPeakExtractionButton">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="toolTip">
-      <string>Extract ODF peaks using finite differences on the densely sampled ODF surface.</string>
-     </property>
-     <property name="text">
-      <string>Start Peak Extraction</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Spherical Harmonic Convention</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QComboBox" name="m_ToolkitBox">
         <property name="toolTip">
          <string>Define SH coefficient convention (depends on toolkit)</string>
         </property>
         <property name="currentIndex">
          <number>0</number>
         </property>
         <item>
          <property name="text">
           <string>MITK/FSL</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>MRtrix</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item row="17" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>259</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBoxWithSelectNone</class>
    <extends>QComboBox</extends>
    <header>QmitkDataStorageComboBoxWithSelectNone.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/files.cmake
index 0009a93c61..f24fdc236a 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/files.cmake
@@ -1,42 +1,43 @@
 set(SRC_CPP_FILES
 
 
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
-  
+
   QmitkPreprocessingView.cpp
+  QmitkDwiPreprocessingPerspective.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkPreprocessingViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
 
   src/internal/QmitkPreprocessingView.h
+  src/internal/QmitkDwiPreprocessingPerspective.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
-  
-  resources/preprocessing.png
+
   resources/dwi2.png
 )
 
 set(QRC_FILES
 
 )
 
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/plugin.xml
index 6fe5a3812b..cc085d4be1 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/plugin.xml
@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
 
     <view id="org.mitk.views.diffusionpreprocessing"
     name="Preprocessing"
     category="Preprocessing"
     class="QmitkPreprocessingView"
     icon="resources/dwi2.png">
     <keywordReference id="org.mitk.views.diffusionpreprocessing.Keyword"/>
     </view>
 
   </extension>
 
+  <extension point="org.blueberry.ui.perspectives">
+
+    <perspective id="org.mitk.perspectives.dwipreprocessing"
+    name="Preprocessing"
+    class="QmitkDwiPreprocessingPerspective"
+    icon="resources/dwi2.png">
+    <description>This perspective contains views for diffusion-weighted image preprocessing such as head motion correction, registration, denoising and gradient manipulation.</description>
+    </perspective>
+
+  </extension>
+
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/preprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/preprocessing.png
deleted file mode 100644
index d7564ca333..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/preprocessing.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/preprocessing.xcf b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/preprocessing.xcf
deleted file mode 100644
index c7b840caf9..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/preprocessing.xcf and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/prprocessing.svg b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/prprocessing.svg
new file mode 100644
index 0000000000..f999c4dd3a
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/resources/prprocessing.svg
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 40 36.7"
+   style="enable-background:new 0 0 40 36.7;"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="icon_tof_settings.svg"><metadata
+     id="metadata31"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs29" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="686"
+     inkscape:window-height="480"
+     id="namedview27"
+     showgrid="false"
+     inkscape:zoom="6.4305176"
+     inkscape:cx="20"
+     inkscape:cy="18.35"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><style
+     type="text/css"
+     id="style4">
+	.st0{display:none;}
+	.st1{display:inline;fill:#9D9D9C;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:none;stroke:#000000;stroke-width:7;stroke-miterlimit:10;}
+	.st4{fill:#C0C5CD;}
+	.st5{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st6{fill:none;stroke:#C0C5CD;stroke-width:2;stroke-miterlimit:10;}
+	.st7{fill:#0096AE;}
+	.st8{fill:#244F9E;}
+	.st9{fill:none;stroke:#000000;stroke-width:5;stroke-miterlimit:10;}
+	.st10{fill:none;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-miterlimit:10;}
+	.st11{fill:none;stroke:#000000;stroke-width:5;stroke-linecap:square;stroke-miterlimit:10;}
+	.st12{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st13{fill:#CEC917;}
+	.st14{fill:none;stroke:#FFFFFF;stroke-width:6;stroke-linecap:round;stroke-miterlimit:10;}
+	.st15{fill:none;stroke:#1D71B8;stroke-width:4;stroke-miterlimit:10;}
+	.st16{fill:none;stroke:#FFFFFF;stroke-width:5;stroke-linecap:round;stroke-miterlimit:10;}
+	.st17{fill:none;stroke:#E6007E;stroke-width:4;stroke-miterlimit:10;}
+	.st18{fill:#1C1C1B;}
+	.st19{fill:#010202;stroke:#FFFFFF;stroke-miterlimit:10;}
+	.st20{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;}
+	.st21{fill:#010202;}
+	.st22{stroke:#000000;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st23{fill:none;stroke:#000000;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st24{fill:none;stroke:#1C1C1B;stroke-miterlimit:10;}
+	.st25{fill:none;stroke:#1C1C1B;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st26{fill:none;stroke:#009640;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st27{fill:none;}
+	.st28{clip-path:url(#SVGID_2_);}
+	.st29{clip-path:url(#SVGID_2_);fill:none;}
+	.st30{clip-path:url(#SVGID_4_);fill:none;}
+	.st31{clip-path:url(#SVGID_4_);}
+	.st32{clip-path:url(#SVGID_6_);fill:none;}
+	.st33{clip-path:url(#SVGID_6_);}
+	.st34{clip-path:url(#SVGID_8_);}
+	.st35{clip-path:url(#SVGID_8_);fill:none;}
+	.st36{clip-path:url(#SVGID_10_);fill:#FFFFFF;}
+	.st37{clip-path:url(#SVGID_10_);}
+	.st38{fill:none;stroke:#009640;stroke-width:6;stroke-linecap:round;stroke-miterlimit:10;}
+	.st39{fill:none;stroke:#010202;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st40{fill:none;stroke:#010202;stroke-width:6;stroke-linecap:round;stroke-miterlimit:10;}
+	.st41{fill:none;stroke:#010202;stroke-width:9;stroke-linecap:round;stroke-miterlimit:10;}
+	.st42{fill:none;stroke:#010202;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
+	.st43{fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st44{fill:#E6007E;}
+	.st45{fill:none;stroke:#E6007E;stroke-width:7;stroke-miterlimit:10;}
+	.st46{fill:none;stroke:#1C1C1B;stroke-width:5;stroke-miterlimit:10;}
+	.st47{fill:none;stroke:#1C1C1B;stroke-width:5;stroke-miterlimit:10;stroke-dasharray:9.8182,4.0909;}
+	.st48{fill:none;stroke:#1C1C1B;stroke-width:5;stroke-miterlimit:10;stroke-dasharray:12,5;}
+	.st49{fill:none;stroke:#1C1C1B;stroke-width:4;stroke-miterlimit:10;}
+	.st50{fill:none;stroke:#1C1C1B;stroke-width:4;stroke-miterlimit:10;stroke-dasharray:9.8182,4.0909;}
+	.st51{fill:none;stroke:#1C1C1B;stroke-width:4;stroke-miterlimit:10;stroke-dasharray:12,5;}
+	.st52{fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:10;}
+	.st53{clip-path:url(#SVGID_12_);}
+	.st54{clip-path:url(#SVGID_12_);fill:none;}
+	.st55{clip-path:url(#SVGID_14_);}
+	.st56{fill:none;stroke:#81181A;stroke-miterlimit:10;}
+	.st57{fill:none;stroke:#037C90;stroke-miterlimit:10;}
+	.st58{fill:none;stroke:#35393B;stroke-miterlimit:10;}
+	.st59{fill:none;stroke:#A0151A;stroke-miterlimit:10;}
+	.st60{fill:none;stroke:#1C1C1B;stroke-linecap:square;stroke-miterlimit:10;}
+	.st61{fill:none;stroke:#1C1C1B;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st62{clip-path:url(#SVGID_16_);}
+	.st63{fill:none;stroke:#FFFFFF;stroke-width:4;stroke-miterlimit:10;}
+	.st64{clip-path:url(#SVGID_18_);}
+	.st65{clip-path:url(#SVGID_18_);fill:#FFFFFF;}
+	.st66{clip-path:url(#SVGID_20_);}
+	.st67{clip-path:url(#SVGID_22_);}
+</style><g
+     id="Ebene_4"
+     class="st0"><rect
+       x="-142.8"
+       y="-1023.8"
+       class="st1"
+       width="1421.9"
+       height="1801.4"
+       id="rect7" /></g><g
+     id="Ebene_2"
+     style="fill:#00ff00;fill-opacity:1;stroke:none" /><g
+     id="Ebene_1"
+     style="fill:#00ff00;fill-opacity:1;stroke:none" /><g
+     id="Ebene_3"
+     style="fill:#00ff00;fill-opacity:1;stroke:none"><g
+       id="g12"
+       style="fill:#00ff00;fill-opacity:1;stroke:none"><g
+         id="g14"
+         style="fill:#00ff00;fill-opacity:1;stroke:none"><path
+           class="st18"
+           d="M38.8,23.3H1.2c-0.7,0-1.2,0.6-1.2,1.2v6.2c0,0.7,0.6,1.2,1.2,1.2h37.5c0.7,0,1.2-0.6,1.2-1.2v-6.2     C40,23.9,39.4,23.3,38.8,23.3z M7.7,29.6c-1,0-1.9-0.8-1.9-1.9s0.8-1.9,1.9-1.9c1,0,1.9,0.8,1.9,1.9S8.7,29.6,7.7,29.6z      M17.4,29.6c-1,0-1.9-0.8-1.9-1.9s0.8-1.9,1.9-1.9c1,0,1.9,0.8,1.9,1.9S18.5,29.6,17.4,29.6z M22.6,29.6c-1,0-1.9-0.8-1.9-1.9     s0.8-1.9,1.9-1.9c1,0,1.9,0.8,1.9,1.9S23.6,29.6,22.6,29.6z"
+           id="path16"
+           style="fill:#00ff00;fill-opacity:1;stroke:none" /><path
+           class="st18"
+           d="M15.4,36.7c-0.4-1.1-0.5-1.2-0.1-1.4l4-2.3c0.4-0.2,0.9-0.2,1.3,0l4,2.3c0.4,0.2,0.3,0.4-0.1,1.4H15.4z"
+           id="path18"
+           style="fill:#00ff00;fill-opacity:1;stroke:none" /></g><g
+         id="g20"
+         style="fill:#00ff00;fill-opacity:1;stroke:none"><g
+           id="XMLID_56_"
+           style="fill:#00ff00;fill-opacity:1;stroke:none"><g
+             id="g23"
+             style="fill:#00ff00;fill-opacity:1;stroke:none"><path
+               d="M20,13.3c1.8,0,3.3-1.5,3.3-3.3c0-1.8-1.5-3.3-3.3-3.3c-1.8,0-3.3,1.5-3.3,3.3C16.7,11.8,18.2,13.3,20,13.3z M30,9.2       c0,0,0,0.4,0,0.8c0,0.4,0,0.6,0,0.6c0,0.2-0.2,0.5-0.4,0.6l-1.6,0.7c0,0-0.1,0-0.1,0.1c-0.2,0.7-0.4,1.3-0.8,2       c0,0.1,0,0.1,0,0.2l0.7,1.6c0.1,0.2,0,0.6-0.1,0.7l-1,1c-0.2,0.2-0.5,0.2-0.7,0.1L24.2,17c-0.1,0-0.1,0-0.2,0       c-0.6,0.3-1.2,0.6-1.9,0.8c0,0-0.1,0.1-0.1,0.1l-0.7,1.7c-0.1,0.2-0.4,0.4-0.6,0.4c0,0-0.4,0-0.8,0c-0.4,0-0.6,0-0.6,0       c-0.2,0-0.5-0.2-0.6-0.4l-0.7-1.6c0,0,0-0.1-0.1-0.1c-0.7-0.2-1.3-0.4-1.9-0.8c-0.1,0-0.1,0-0.2,0l-1.6,0.7       c-0.2,0.1-0.6,0-0.7-0.1l-1-1c-0.2-0.2-0.2-0.5-0.1-0.7l0.7-1.7c0,0,0-0.1,0-0.2c-0.3-0.6-0.6-1.2-0.8-1.8c0,0-0.1-0.1-0.1-0.1       l-1.7-0.7c-0.2-0.1-0.4-0.4-0.4-0.6c0,0,0-0.4,0-0.8c0-0.4,0-0.6,0-0.6c0-0.2,0.2-0.5,0.4-0.6l1.6-0.7c0,0,0.1,0,0.1-0.1       c0.2-0.7,0.4-1.3,0.8-1.9c0-0.1,0-0.1,0-0.2l-0.7-1.6c-0.1-0.2,0-0.6,0.1-0.7l1-1c0.2-0.2,0.5-0.2,0.7-0.1L15.8,3       c0,0,0.1,0,0.2,0c0.6-0.3,1.2-0.6,1.8-0.8c0,0,0.1-0.1,0.1-0.1l0.7-1.7c0.1-0.2,0.4-0.4,0.6-0.4c0,0,0.4,0,0.8,0       c0.4,0,0.6,0,0.6,0c0.2,0,0.5,0.2,0.6,0.4l0.7,1.6c0,0,0.1,0.1,0.1,0.1c0.7,0.2,1.3,0.4,2,0.8c0.1,0,0.1,0,0.2,0l1.6-0.7       c0.2-0.1,0.6,0,0.7,0.1l1,1c0.2,0.2,0.2,0.5,0.1,0.7L27,5.8c0,0.1,0,0.1,0,0.2c0.3,0.6,0.6,1.2,0.8,1.9c0.1,0,0.1,0.1,0.1,0.1       l1.7,0.7C29.7,8.7,29.9,8.9,30,9.2z"
+               id="path25"
+               style="fill:#00ff00;fill-opacity:1;stroke:none" /></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkDwiPreprocessingPerspective.cpp
similarity index 88%
rename from Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.cpp
rename to Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkDwiPreprocessingPerspective.cpp
index ed5f3f8a56..e1ec1795ab 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkDwiPreprocessingPerspective.cpp
@@ -1,49 +1,51 @@
 /*===================================================================
 
 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 "QmitkDwiRegistrationPerspective.h"
+#include "QmitkDwiPreprocessingPerspective.h"
 #include "berryIViewLayout.h"
 
-void  QmitkDwiRegistrationPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
+void  QmitkDwiPreprocessingPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
     /////////////////////////////////////////////////////
     // all di-app perspectives should have the following:
     /////////////////////////////////////////////////////
 
     QString editorArea = layout->GetEditorArea();
 
     layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
     layout->AddStandaloneView("org.mitk.views.datamanager",
                               false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
     layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
                               false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
     berry::IFolderLayout::Pointer left =
             layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
                                  berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
     layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
                                          berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
     /////////////////////////////////////////////
     // here goes the perspective specific stuff
     /////////////////////////////////////////////
 
+    left->AddView("org.mitk.views.diffusionpreprocessing");
+    left->AddView("org.mitk.views.denoisingview");
     left->AddView("org.mitk.views.simpleregistrationview");
     left->AddView("org.mitk.views.headmotioncorrectionview");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkDwiPreprocessingPerspective.h
similarity index 73%
copy from Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.h
copy to Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkDwiPreprocessingPerspective.h
index c89a61672e..bdfc1cf04f 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.h
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkDwiPreprocessingPerspective.h
@@ -1,36 +1,36 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
-#ifndef QmitkDwiRegistrationPerspective_H_
-#define QmitkDwiRegistrationPerspective_H_
+#ifndef QmitkDwiPreprocessingPerspective_H_
+#define QmitkDwiPreprocessingPerspective_H_
 
 #include <berryIPerspectiveFactory.h>
 
-class QmitkDwiRegistrationPerspective : public QObject, public berry::IPerspectiveFactory
+class QmitkDwiPreprocessingPerspective : public QObject, public berry::IPerspectiveFactory
 {
   Q_OBJECT
   Q_INTERFACES(berry::IPerspectiveFactory)
 
 public:
 
-  QmitkDwiRegistrationPerspective() {}
-  ~QmitkDwiRegistrationPerspective() {}
+  QmitkDwiPreprocessingPerspective() {}
+  ~QmitkDwiPreprocessingPerspective() {}
 
   void CreateInitialLayout(berry::IPageLayout::Pointer layout) override;
 };
 
 #endif /* QmitkFiberProcessingPerspective_H_ */
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.cpp
index 0fd430d313..7a61bff986 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.cpp
@@ -1,1962 +1,1962 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 //#define MBILOG_ENABLE_DEBUG
 
 #include "QmitkPreprocessingView.h"
 #include "mitkDiffusionImagingConfigure.h"
 
 // qt includes
 #include <QMessageBox>
 
 // itk includes
 #include "itkTimeProbe.h"
 #include "itkB0ImageExtractionImageFilter.h"
 #include "itkB0ImageExtractionToSeparateImageFilter.h"
 #include "itkBrainMaskExtractionImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "itkVectorContainer.h"
 #include <itkElectrostaticRepulsionDiffusionGradientReductionFilter.h>
 #include <itkMergeDiffusionImagesFilter.h>
 #include <itkDwiGradientLengthCorrectionFilter.h>
 #include <itkDwiNormilzationFilter.h>
 #include <mitkTensorImage.h>
 #include <mitkOdfImage.h>
 
 // Multishell includes
 #include <itkRadialMultishellToSingleshellImageFilter.h>
 
 // Multishell Functors
 #include <itkADCAverageFunctor.h>
 #include <itkKurtosisFitFunctor.h>
 #include <itkBiExpFitFunctor.h>
 #include <itkADCFitFunctor.h>
 
 // mitk includes
 #include "QmitkDataStorageComboBox.h"
 #include "mitkProgressBar.h"
 #include "mitkStatusBar.h"
 #include "mitkNodePredicateDataType.h"
 #include "mitkProperties.h"
 #include "mitkVtkResliceInterpolationProperty.h"
 #include "mitkLookupTable.h"
 #include "mitkLookupTableProperty.h"
 #include "mitkTransferFunction.h"
 #include "mitkTransferFunctionProperty.h"
 #include "mitkDataNodeObject.h"
 #include "mitkOdfNormalizationMethodProperty.h"
 #include "mitkOdfScaleByProperty.h"
 #include <mitkPointSet.h>
 #include <itkAdcImageFilter.h>
 #include <itkBrainMaskExtractionImageFilter.h>
 #include <mitkImageCast.h>
 #include <mitkRotationOperation.h>
 #include <QTableWidgetItem>
 #include <QTableWidget>
 #include <mitkInteractionConst.h>
 #include <mitkImageAccessByItk.h>
 #include <itkResampleDwiImageFilter.h>
 #include <itkResampleImageFilter.h>
 #include <itkImageDuplicator.h>
 #include <itkMaskImageFilter.h>
 #include <mitkNodePredicateProperty.h>
 #include <mitkNodePredicateAnd.h>
 #include <mitkNodePredicateNot.h>
 #include <mitkNodePredicateOr.h>
 #include <itkCropImageFilter.h>
 #include <itkDiffusionTensor3DReconstructionImageFilter.h>
 #include <itkRemoveDwiChannelFilter.h>
 #include <itkExtractDwiChannelFilter.h>
 #include <mitkBValueMapProperty.h>
 #include <mitkGradientDirectionsProperty.h>
 #include <mitkMeasurementFrameProperty.h>
 #include <itkImageDuplicator.h>
 #include <itkFlipImageFilter.h>
 #include <mitkITKImageImport.h>
 
 const std::string QmitkPreprocessingView::VIEW_ID =
-    "org.mitk.views.preprocessing";
+    "org.mitk.views.diffusionpreprocessing";
 
 #define DI_INFO MITK_INFO("DiffusionImaging")
 
 
 typedef float TTensorPixelType;
 
 
 QmitkPreprocessingView::QmitkPreprocessingView()
   : QmitkAbstractView(),
     m_Controls(nullptr)
 {
 }
 
 QmitkPreprocessingView::~QmitkPreprocessingView()
 {
 
 }
 
 void QmitkPreprocessingView::CreateQtPartControl(QWidget *parent)
 {
   if (!m_Controls)
   {
     // create GUI widgets
     m_Controls = new Ui::QmitkPreprocessingViewControls;
     m_Controls->setupUi(parent);
     this->CreateConnections();
 
     m_Controls->m_MeasurementFrameTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     m_Controls->m_MeasurementFrameTable->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     m_Controls->m_DirectionMatrixTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     m_Controls->m_DirectionMatrixTable->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
   }
 }
 
 void QmitkPreprocessingView::SetFocus()
 {
   m_Controls->m_MirrorGradientToHalfSphereButton->setFocus();
 }
 
 void QmitkPreprocessingView::CreateConnections()
 {
   if ( m_Controls )
   {
     m_Controls->m_NormalizationMaskBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_SelctedImageComboBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_MergeDwiBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_AlignImageBox->SetDataStorage(this->GetDataStorage());
 
     mitk::TNodePredicateDataType<mitk::Image>::Pointer isMitkImage = mitk::TNodePredicateDataType<mitk::Image>::New();
 
     mitk::NodePredicateDataType::Pointer isDti = mitk::NodePredicateDataType::New("TensorImage");
     mitk::NodePredicateDataType::Pointer isOdf = mitk::NodePredicateDataType::New("OdfImage");
     mitk::NodePredicateOr::Pointer isDiffusionImage = mitk::NodePredicateOr::New(isOdf, isDti);
 
     mitk::NodePredicateAnd::Pointer noDiffusionImage = mitk::NodePredicateAnd::New(isMitkImage, mitk::NodePredicateNot::New(isDiffusionImage));
     mitk::NodePredicateProperty::Pointer isBinaryPredicate = mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true));
     mitk::NodePredicateAnd::Pointer binaryNoDiffusionImage = mitk::NodePredicateAnd::New(noDiffusionImage, isBinaryPredicate);
 
     m_Controls->m_NormalizationMaskBox->SetPredicate(binaryNoDiffusionImage);
     m_Controls->m_SelctedImageComboBox->SetPredicate(isMitkImage);
     m_Controls->m_MergeDwiBox->SetPredicate(isMitkImage);
     m_Controls->m_AlignImageBox->SetPredicate(isMitkImage);
 
     m_Controls->m_ExtractBrainMask->setVisible(false);
     m_Controls->m_BrainMaskIterationsBox->setVisible(false);
     m_Controls->m_ResampleIntFrame->setVisible(false);
     connect( (QObject*)(m_Controls->m_ButtonAverageGradients), SIGNAL(clicked()), this, SLOT(AverageGradients()) );
     connect( (QObject*)(m_Controls->m_ButtonExtractB0), SIGNAL(clicked()), this, SLOT(ExtractB0()) );
     connect( (QObject*)(m_Controls->m_ReduceGradientsButton), SIGNAL(clicked()), this, SLOT(DoReduceGradientDirections()) );
     connect( (QObject*)(m_Controls->m_ShowGradientsButton), SIGNAL(clicked()), this, SLOT(DoShowGradientDirections()) );
     connect( (QObject*)(m_Controls->m_MirrorGradientToHalfSphereButton), SIGNAL(clicked()), this, SLOT(DoHalfSphereGradientDirections()) );
     connect( (QObject*)(m_Controls->m_MergeDwisButton), SIGNAL(clicked()), this, SLOT(MergeDwis()) );
     connect( (QObject*)(m_Controls->m_ProjectSignalButton), SIGNAL(clicked()), this, SLOT(DoProjectSignal()) );
     connect( (QObject*)(m_Controls->m_B_ValueMap_Rounder_SpinBox), SIGNAL(valueChanged(int)), this, SLOT(UpdateDwiBValueMapRounder(int)));
     connect( (QObject*)(m_Controls->m_CreateLengthCorrectedDwi), SIGNAL(clicked()), this, SLOT(DoLengthCorrection()) );
     connect( (QObject*)(m_Controls->m_NormalizeImageValuesButton), SIGNAL(clicked()), this, SLOT(DoDwiNormalization()) );
     connect( (QObject*)(m_Controls->m_ResampleImageButton), SIGNAL(clicked()), this, SLOT(DoResampleImage()) );
     connect( (QObject*)(m_Controls->m_ResampleTypeBox), SIGNAL(currentIndexChanged(int)), this, SLOT(DoUpdateInterpolationGui(int)) );
     connect( (QObject*)(m_Controls->m_CropImageButton), SIGNAL(clicked()), this, SLOT(DoCropImage()) );
     connect( (QObject*)(m_Controls->m_RemoveGradientButton), SIGNAL(clicked()), this, SLOT(DoRemoveGradient()) );
     connect( (QObject*)(m_Controls->m_ExtractGradientButton), SIGNAL(clicked()), this, SLOT(DoExtractGradient()) );
     connect( (QObject*)(m_Controls->m_FlipAxis), SIGNAL(clicked()), this, SLOT(DoFlipAxis()) );
     connect( (QObject*)(m_Controls->m_FlipGradientsButton), SIGNAL(clicked()), this, SLOT(DoFlipGradientDirections()) );
     connect( (QObject*)(m_Controls->m_ClearRotationButton), SIGNAL(clicked()), this, SLOT(DoClearRotationOfGradients()) );
     connect( (QObject*)(m_Controls->m_ModifyHeader), SIGNAL(clicked()), this, SLOT(DoApplyHeader()) );
     connect( (QObject*)(m_Controls->m_AlignImageButton), SIGNAL(clicked()), this, SLOT(DoAlignImages()) );
 
 
 
     connect( (QObject*)(m_Controls->m_SelctedImageComboBox), SIGNAL(OnSelectionChanged(const mitk::DataNode*)),
              this, SLOT(OnImageSelectionChanged()) );
 
     m_Controls->m_NormalizationMaskBox->SetZeroEntryText("--");
 
   }
 }
 
 void QmitkPreprocessingView::DoAlignImages()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
 
   mitk::DataNode::Pointer target_node = m_Controls->m_AlignImageBox->GetSelectedNode();
   if (target_node.IsNull()) { return; }
 
   mitk::Image::Pointer target_image = dynamic_cast<mitk::Image*>(target_node->GetData());
   if ( target_image == nullptr ) { return; }
 
   image->SetOrigin(target_image->GetGeometry()->GetOrigin());
   mitk::RenderingManager::GetInstance()->InitializeViews( image->GetTimeGeometry(),
                                                           mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                           true );
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkPreprocessingView::DoFlipAxis()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(node) );
 
   if (isDiffusionImage)
   {
     ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
     mitk::CastToItkImage(image, itkVectorImagePointer);
 
     itk::FixedArray<bool, 3> flipAxes;
     flipAxes[0] = m_Controls->m_FlipX->isChecked();
     flipAxes[1] = m_Controls->m_FlipY->isChecked();
     flipAxes[2] = m_Controls->m_FlipZ->isChecked();
 
     itk::FlipImageFilter< ItkDwiType >::Pointer flipper = itk::FlipImageFilter< ItkDwiType >::New();
     flipper->SetInput(itkVectorImagePointer);
     flipper->SetFlipAxes(flipAxes);
     flipper->Update();
 
     GradProp::GradientDirectionsContainerType::Pointer oldGradients
         = static_cast<GradProp*>
           ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
             ->GetGradientDirectionsContainer();
 
     GradProp::GradientDirectionsContainerType::Pointer newGradients
         = GradProp::GradientDirectionsContainerType::New();
 
     for (unsigned int i=0; i<oldGradients->Size(); i++)
     {
       GradProp::GradientDirectionType g = oldGradients->GetElement(i);
       GradProp::GradientDirectionType newG = g;
       if (flipAxes[0]) { newG[0] *= -1; }
 
       if (flipAxes[1]) { newG[1] *= -1; }
 
       if (flipAxes[2]) { newG[2] *= -1; }
 
       newGradients->InsertElement(i, newG);
     }
 
     mitk::Image::Pointer newImage = mitk::GrabItkImageMemory( flipper->GetOutput() );
     PropHelper::CopyProperties(image, newImage, true);
     newImage->GetPropertyList()->ReplaceProperty( PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str(), GradProp::New( newGradients ) );
     PropHelper propertyHelper( newImage );
     propertyHelper.InitializeImage();
     newImage->GetGeometry()->SetOrigin(image->GetGeometry()->GetOrigin());
 
     mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
     imageNode->SetData( newImage );
     QString name = node->GetName().c_str();
 
     imageNode->SetName((name+"_flipped").toStdString().c_str());
     GetDataStorage()->Add(imageNode, node);
 
     mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(), mitk::RenderingManager::REQUEST_UPDATE_ALL, true );
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
   else if( image->GetPixelType().GetNumberOfComponents() == 1 )
   {
     AccessFixedDimensionByItk(image, TemplatedFlipAxis,3);
   }
   else
   {
     QMessageBox::warning(nullptr,"Warning", QString("Operation not supported in multi-component images") );
   }
 }
 
 
 template < typename TPixel, unsigned int VImageDimension >
 void QmitkPreprocessingView::TemplatedFlipAxis(itk::Image<TPixel, VImageDimension>* itkImage)
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   itk::FixedArray<bool, 3> flipAxes;
   flipAxes[0] = m_Controls->m_FlipX->isChecked();
   flipAxes[1] = m_Controls->m_FlipY->isChecked();
   flipAxes[2] = m_Controls->m_FlipZ->isChecked();
 
   typename itk::FlipImageFilter< itk::Image<TPixel, VImageDimension> >::Pointer flipper
       = itk::FlipImageFilter< itk::Image<TPixel, VImageDimension> >::New();
   flipper->SetInput(itkImage);
   flipper->SetFlipAxes(flipAxes);
   flipper->Update();
 
   mitk::Image::Pointer newImage = mitk::GrabItkImageMemory( flipper->GetOutput() );
   newImage->GetGeometry()->SetOrigin(image->GetGeometry()->GetOrigin());
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newImage );
   QString name = node->GetName().c_str();
 
   imageNode->SetName((name+"_flipped").toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 
   mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(),
                                                           mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                           true );
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkPreprocessingView::DoRemoveGradient()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage )
   {
     return;
   }
 
   std::vector< unsigned int > channelsToRemove;
   channelsToRemove.push_back(m_Controls->m_RemoveGradientBox->value());
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
 
   itk::RemoveDwiChannelFilter< short >::Pointer filter = itk::RemoveDwiChannelFilter< short >::New();
   filter->SetInput(itkVectorImagePointer);
   filter->SetChannelIndices(channelsToRemove);
 
   filter->SetDirections( static_cast<GradProp*>
                          ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
                            ->GetGradientDirectionsContainer() );
   filter->Update();
 
   mitk::Image::Pointer newImage = mitk::GrabItkImageMemory( filter->GetOutput() );
   PropHelper::CopyProperties(image, newImage, true);
   newImage->GetPropertyList()->ReplaceProperty( PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str(), GradProp::New( filter->GetNewDirections() ) );
   PropHelper propertyHelper( newImage );
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newImage );
   QString name = node->GetName().c_str();
 
   imageNode->SetName((name+"_removedgradients").toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 
   mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(),
                                                           mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                           true );
 
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkPreprocessingView::DoExtractGradient()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage ) { return; }
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
 
   unsigned int channel = m_Controls->m_ExtractGradientBox->value();
   itk::ExtractDwiChannelFilter< short >::Pointer filter = itk::ExtractDwiChannelFilter< short >::New();
   filter->SetInput( itkVectorImagePointer);
   filter->SetChannelIndex(channel);
   filter->Update();
 
   mitk::Image::Pointer newImage = mitk::Image::New();
   newImage->InitializeByItk( filter->GetOutput() );
   newImage->SetImportChannel( filter->GetOutput()->GetBufferPointer() );
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newImage );
 
   QString name = node->GetName().c_str();
   imageNode->SetName( (name+"_direction-"+QString::number(channel)).toStdString().c_str() );
   GetDataStorage()->Add(imageNode, node);
 
   mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(),
                                                           mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                           true);
 }
 
 void QmitkPreprocessingView::DoCropImage()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( isDiffusionImage )
   {
     ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
     mitk::CastToItkImage(image, itkVectorImagePointer);
 
     ItkDwiType::SizeType lower;
     ItkDwiType::SizeType upper;
     lower[0] = m_Controls->m_XstartBox->value();
     lower[1] = m_Controls->m_YstartBox->value();
     lower[2] = m_Controls->m_ZstartBox->value();
     upper[0] = m_Controls->m_XendBox->value();
     upper[1] = m_Controls->m_YendBox->value();
     upper[2] = m_Controls->m_ZendBox->value();
 
     itk::CropImageFilter< ItkDwiType, ItkDwiType >::Pointer cropper = itk::CropImageFilter< ItkDwiType, ItkDwiType >::New();
     cropper->SetLowerBoundaryCropSize(lower);
     cropper->SetUpperBoundaryCropSize(upper);
     cropper->SetInput( itkVectorImagePointer );
     cropper->Update();
 
     ItkDwiType::Pointer itkOutImage = cropper->GetOutput();
     ItkDwiType::DirectionType dir = itkOutImage->GetDirection();
     itk::Point<double,3> origin = itkOutImage->GetOrigin();
 
     itk::Point<double,3> t; t[0] = lower[0]*itkOutImage->GetSpacing()[0]; t[1] = lower[1]*itkOutImage->GetSpacing()[1]; t[2] = lower[2]*itkOutImage->GetSpacing()[2];
     t= dir*t;
 
     origin[0] += t[0];
     origin[1] += t[1];
     origin[2] += t[2];
 
     itkOutImage->SetOrigin(origin);
 
     mitk::Image::Pointer newimage = mitk::GrabItkImageMemory( itkOutImage );
     PropHelper::CopyProperties(image, newimage, false);
     PropHelper propertyHelper( newimage );
     propertyHelper.InitializeImage();
 
     mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
     imageNode->SetData( newimage );
     QString name = node->GetName().c_str();
     imageNode->SetName((name+"_cropped").toStdString().c_str());
     GetDataStorage()->Add(imageNode, node);
     mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(),
                                                             mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                             true );
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 
     mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(),
                                                             mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                             true );
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
   else if( image->GetPixelType().GetNumberOfComponents() )
   {
     AccessFixedDimensionByItk(image, TemplatedCropImage,3);
   }
   else
   {
     QMessageBox::warning(nullptr,"Warning", QString("Operation not supported in multi-component images") );
   }
 }
 
 template < typename TPixel, unsigned int VImageDimension >
 void QmitkPreprocessingView::TemplatedCropImage( itk::Image<TPixel, VImageDimension>* itkImage)
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   ItkDwiType::SizeType lower;
   ItkDwiType::SizeType upper;
   lower[0] = m_Controls->m_XstartBox->value();
   lower[1] = m_Controls->m_YstartBox->value();
   lower[2] = m_Controls->m_ZstartBox->value();
   upper[0] = m_Controls->m_XendBox->value();
   upper[1] = m_Controls->m_YendBox->value();
   upper[2] = m_Controls->m_ZendBox->value();
 
   typedef itk::Image<TPixel, VImageDimension> ImageType;
   typename itk::CropImageFilter< ImageType, ImageType >::Pointer cropper
       = itk::CropImageFilter< ImageType, ImageType >::New();
   cropper->SetLowerBoundaryCropSize(lower);
   cropper->SetUpperBoundaryCropSize(upper);
   cropper->SetInput(itkImage);
   cropper->Update();
 
   typename ImageType::Pointer itkOutImage = cropper->GetOutput();
   typename ImageType::DirectionType dir = itkOutImage->GetDirection();
   itk::Point<double,3> origin = itkOutImage->GetOrigin();
 
   itk::Point<double,3> t; t[0] = lower[0]*itkOutImage->GetSpacing()[0]; t[1] = lower[1]*itkOutImage->GetSpacing()[1]; t[2] = lower[2]*itkOutImage->GetSpacing()[2];
   t= dir*t;
 
   origin[0] += t[0];
   origin[1] += t[1];
   origin[2] += t[2];
 
   itkOutImage->SetOrigin(origin);
   mitk::Image::Pointer image = mitk::Image::New();
   image->InitializeByItk( itkOutImage.GetPointer() );
   image->SetVolume( itkOutImage->GetBufferPointer() );
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( image );
   QString name = node->GetName().c_str();
 
   imageNode->SetName((name+"_cropped").toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 
   mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(),
                                                           mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                           true );
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkPreprocessingView::DoUpdateInterpolationGui(int i)
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   switch (i)
   {
     case 0:
     {
       m_Controls->m_ResampleIntFrame->setVisible(false);
       m_Controls->m_ResampleDoubleFrame->setVisible(true);
       break;
     }
     case 1:
     {
       m_Controls->m_ResampleIntFrame->setVisible(false);
       m_Controls->m_ResampleDoubleFrame->setVisible(true);
 
       mitk::BaseGeometry* geom = image->GetGeometry();
       m_Controls->m_ResampleDoubleX->setValue(geom->GetSpacing()[0]);
       m_Controls->m_ResampleDoubleY->setValue(geom->GetSpacing()[1]);
       m_Controls->m_ResampleDoubleZ->setValue(geom->GetSpacing()[2]);
       break;
     }
     case 2:
     {
       m_Controls->m_ResampleIntFrame->setVisible(true);
       m_Controls->m_ResampleDoubleFrame->setVisible(false);
 
       mitk::BaseGeometry* geom = image->GetGeometry();
       m_Controls->m_ResampleIntX->setValue(geom->GetExtent(0));
       m_Controls->m_ResampleIntY->setValue(geom->GetExtent(1));
       m_Controls->m_ResampleIntZ->setValue(geom->GetExtent(2));
       break;
     }
     default:
     {
       m_Controls->m_ResampleIntFrame->setVisible(false);
       m_Controls->m_ResampleDoubleFrame->setVisible(true);
     }
   }
 }
 
 void QmitkPreprocessingView::DoExtractBrainMask()
 {
 }
 
 void QmitkPreprocessingView::DoResampleImage()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( isDiffusionImage )
   {
     ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
     mitk::CastToItkImage(image, itkVectorImagePointer);
 
     typedef itk::ResampleDwiImageFilter< short > ResampleFilter;
     ResampleFilter::Pointer resampler = ResampleFilter::New();
     resampler->SetInput( itkVectorImagePointer );
 
     switch (m_Controls->m_ResampleTypeBox->currentIndex())
     {
       case 0:
       {
         itk::Vector< double, 3 > samplingFactor;
         samplingFactor[0] = m_Controls->m_ResampleDoubleX->value();
         samplingFactor[1] = m_Controls->m_ResampleDoubleY->value();
         samplingFactor[2] = m_Controls->m_ResampleDoubleZ->value();
         resampler->SetSamplingFactor(samplingFactor);
         break;
       }
       case 1:
       {
         itk::Vector< double, 3 > newSpacing;
         newSpacing[0] = m_Controls->m_ResampleDoubleX->value();
         newSpacing[1] = m_Controls->m_ResampleDoubleY->value();
         newSpacing[2] = m_Controls->m_ResampleDoubleZ->value();
         resampler->SetNewSpacing(newSpacing);
         break;
       }
       case 2:
       {
         itk::ImageRegion<3> newRegion;
         newRegion.SetSize(0, m_Controls->m_ResampleIntX->value());
         newRegion.SetSize(1, m_Controls->m_ResampleIntY->value());
         newRegion.SetSize(2, m_Controls->m_ResampleIntZ->value());
         resampler->SetNewImageSize(newRegion);
         break;
       }
       default:
       {
         MITK_WARN << "Unknown resampling parameters!";
         return;
       }
     }
 
     QString outAdd;
     switch (m_Controls->m_InterpolatorBox->currentIndex())
     {
       case 0:
       {
         resampler->SetInterpolation(ResampleFilter::Interpolate_NearestNeighbour);
         outAdd = "NearestNeighbour";
         break;
       }
       case 1:
       {
         resampler->SetInterpolation(ResampleFilter::Interpolate_Linear);
         outAdd = "Linear";
         break;
       }
       case 2:
       {
         resampler->SetInterpolation(ResampleFilter::Interpolate_BSpline);
         outAdd = "BSpline";
         break;
       }
       case 3:
       {
         resampler->SetInterpolation(ResampleFilter::Interpolate_WindowedSinc);
         outAdd = "WindowedSinc";
         break;
       }
       default:
       {
         resampler->SetInterpolation(ResampleFilter::Interpolate_NearestNeighbour);
         outAdd = "NearestNeighbour";
       }
     }
 
     resampler->Update();
 
     mitk::Image::Pointer newImage = mitk::GrabItkImageMemory( resampler->GetOutput() );
     PropHelper::CopyProperties(image, newImage, false);
     PropHelper propertyHelper( newImage );
     propertyHelper.InitializeImage();
 
     mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
     imageNode->SetData( newImage );
     QString name = node->GetName().c_str();
 
     imageNode->SetName((name+"_resampled_"+outAdd).toStdString().c_str());
     imageNode->SetVisibility(false);
     GetDataStorage()->Add(imageNode, node);
   }
   else if( image->GetPixelType().GetNumberOfComponents() )
   {
     AccessFixedDimensionByItk(image, TemplatedResampleImage,3);
   }
   else
   {
     QMessageBox::warning(nullptr,"Warning", QString("Operation not supported in multi-component images") );
   }
 }
 
 
 template < typename TPixel, unsigned int VImageDimension >
 void QmitkPreprocessingView::TemplatedResampleImage( itk::Image<TPixel, VImageDimension>* itkImage)
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   itk::Vector< double, 3 > newSpacing;
   itk::ImageRegion<3>   newRegion;
 
   switch (m_Controls->m_ResampleTypeBox->currentIndex())
   {
     case 0:
     {
       itk::Vector< double, 3 > sampling;
       sampling[0] = m_Controls->m_ResampleDoubleX->value();
       sampling[1] = m_Controls->m_ResampleDoubleY->value();
       sampling[2] = m_Controls->m_ResampleDoubleZ->value();
 
       newSpacing = itkImage->GetSpacing();
       newSpacing[0] /= sampling[0];
       newSpacing[1] /= sampling[1];
       newSpacing[2] /= sampling[2];
       newRegion = itkImage->GetLargestPossibleRegion();
       newRegion.SetSize(0, newRegion.GetSize(0)*sampling[0]);
       newRegion.SetSize(1, newRegion.GetSize(1)*sampling[1]);
       newRegion.SetSize(2, newRegion.GetSize(2)*sampling[2]);
 
       break;
     }
     case 1:
     {
       newSpacing[0] = m_Controls->m_ResampleDoubleX->value();
       newSpacing[1] = m_Controls->m_ResampleDoubleY->value();
       newSpacing[2] = m_Controls->m_ResampleDoubleZ->value();
 
       itk::Vector< double, 3 > oldSpacing = itkImage->GetSpacing();
       itk::Vector< double, 3 > sampling;
       sampling[0] = oldSpacing[0]/newSpacing[0];
       sampling[1] = oldSpacing[1]/newSpacing[1];
       sampling[2] = oldSpacing[2]/newSpacing[2];
       newRegion = itkImage->GetLargestPossibleRegion();
       newRegion.SetSize(0, newRegion.GetSize(0)*sampling[0]);
       newRegion.SetSize(1, newRegion.GetSize(1)*sampling[1]);
       newRegion.SetSize(2, newRegion.GetSize(2)*sampling[2]);
       break;
     }
     case 2:
     {
       newRegion.SetSize(0, m_Controls->m_ResampleIntX->value());
       newRegion.SetSize(1, m_Controls->m_ResampleIntY->value());
       newRegion.SetSize(2, m_Controls->m_ResampleIntZ->value());
 
       itk::ImageRegion<3> oldRegion = itkImage->GetLargestPossibleRegion();
       itk::Vector< double, 3 > sampling;
       sampling[0] = (double)newRegion.GetSize(0)/oldRegion.GetSize(0);
       sampling[1] = (double)newRegion.GetSize(1)/oldRegion.GetSize(1);
       sampling[2] = (double)newRegion.GetSize(2)/oldRegion.GetSize(2);
 
       newSpacing = itkImage->GetSpacing();
       newSpacing[0] /= sampling[0];
       newSpacing[1] /= sampling[1];
       newSpacing[2] /= sampling[2];
       break;
     }
     default:
     {
       MITK_WARN << "Unknown resampling parameters!";
       return;
     }
   }
 
   itk::Point<double,3> origin = itkImage->GetOrigin();
   origin[0] -= itkImage->GetSpacing()[0]/2;
   origin[1] -= itkImage->GetSpacing()[1]/2;
   origin[2] -= itkImage->GetSpacing()[2]/2;
   origin[0] += newSpacing[0]/2;
   origin[1] += newSpacing[1]/2;
   origin[2] += newSpacing[2]/2;
 
   typedef itk::Image<TPixel, VImageDimension> ImageType;
   typename ImageType::Pointer outImage = ImageType::New();
   outImage->SetSpacing( newSpacing );
   outImage->SetOrigin( origin );
   outImage->SetDirection( itkImage->GetDirection() );
   outImage->SetLargestPossibleRegion( newRegion );
   outImage->SetBufferedRegion( newRegion );
   outImage->SetRequestedRegion( newRegion );
   outImage->Allocate();
 
   typedef itk::ResampleImageFilter<ImageType, ImageType> ResampleFilter;
   typename ResampleFilter::Pointer resampler = ResampleFilter::New();
   resampler->SetInput(itkImage);
   resampler->SetOutputParametersFromImage(outImage);
 
   QString outAdd;
   switch (m_Controls->m_InterpolatorBox->currentIndex())
   {
     case 0:
     {
       typename itk::NearestNeighborInterpolateImageFunction<ImageType>::Pointer interp
           = itk::NearestNeighborInterpolateImageFunction<ImageType>::New();
       resampler->SetInterpolator(interp);
       outAdd = "NearestNeighbour";
       break;
     }
     case 1:
     {
       typename itk::LinearInterpolateImageFunction<ImageType>::Pointer interp
           = itk::LinearInterpolateImageFunction<ImageType>::New();
       resampler->SetInterpolator(interp);
       outAdd = "Linear";
       break;
     }
     case 2:
     {
       typename itk::BSplineInterpolateImageFunction<ImageType>::Pointer interp
           = itk::BSplineInterpolateImageFunction<ImageType>::New();
       resampler->SetInterpolator(interp);
       outAdd = "BSpline";
       break;
     }
     case 3:
     {
       typename itk::WindowedSincInterpolateImageFunction<ImageType, 3>::Pointer interp
           = itk::WindowedSincInterpolateImageFunction<ImageType, 3>::New();
       resampler->SetInterpolator(interp);
       outAdd = "WindowedSinc";
       break;
     }
     default:
     {
       typename itk::NearestNeighborInterpolateImageFunction<ImageType>::Pointer interp
           = itk::NearestNeighborInterpolateImageFunction<ImageType>::New();
       resampler->SetInterpolator(interp);
       outAdd = "NearestNeighbour";
     }
   }
 
   resampler->Update();
 
   mitk::Image::Pointer image = mitk::Image::New();
   image->InitializeByItk( resampler->GetOutput() );
   image->SetVolume( resampler->GetOutput()->GetBufferPointer() );
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( image );
   QString name = node->GetName().c_str();
 
   imageNode->SetName((name+"_resampled_"+outAdd).toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 }
 
 void QmitkPreprocessingView::DoApplyHeader()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
 
   bool isDti = false;
   bool isOdf = false;
   bool isPeak = false;
   if (!isDiffusionImage)
   {
     if ( dynamic_cast<mitk::TensorImage*>(node->GetData()) )
       isDti = true;
     else if ( dynamic_cast<mitk::OdfImage*>(node->GetData()) )
       isOdf = true;
     else if ( dynamic_cast<mitk::PeakImage*>(node->GetData()) )
       isPeak = true;
   }
   mitk::Image::Pointer newImage = image->Clone();
 
   mitk::Vector3D spacing;
   spacing[0] = m_Controls->m_HeaderSpacingX->value();
   spacing[1] = m_Controls->m_HeaderSpacingY->value();
   spacing[2] = m_Controls->m_HeaderSpacingZ->value();
   newImage->GetGeometry()->SetSpacing( spacing );
 
   mitk::Point3D origin;
   origin[0] = m_Controls->m_HeaderOriginX->value();
   origin[1] = m_Controls->m_HeaderOriginY->value();
   origin[2] = m_Controls->m_HeaderOriginZ->value();
   newImage->GetGeometry()->SetOrigin(origin);
 
   vtkSmartPointer< vtkMatrix4x4 > matrix = vtkSmartPointer< vtkMatrix4x4 >::New();
   matrix->SetElement(0,3,newImage->GetGeometry()->GetOrigin()[0]);
   matrix->SetElement(1,3,newImage->GetGeometry()->GetOrigin()[1]);
   matrix->SetElement(2,3,newImage->GetGeometry()->GetOrigin()[2]);
   for (int r=0; r<3; r++)
   {
     for (int c=0; c<3; c++)
     {
       QTableWidgetItem* item = m_Controls->m_DirectionMatrixTable->item(r,c);
       if (!item)
         continue;
       matrix->SetElement(r,c,item->text().toDouble());
     }
   }
   newImage->GetGeometry()->SetIndexToWorldTransformByVtkMatrixWithoutChangingSpacing(matrix);
 
   if ( isDiffusionImage )
   {
     vnl_matrix_fixed< double, 3, 3 > mf;
     for (int r=0; r<3; r++)
     {
       for (int c=0; c<3; c++)
       {
         QTableWidgetItem* item = m_Controls->m_MeasurementFrameTable->item(r,c);
         if (!item)
           continue;
         mf[r][c] = item->text().toDouble();
       }
     }
     newImage->GetPropertyList()->ReplaceProperty( PropHelper::MEASUREMENTFRAMEPROPERTYNAME.c_str(), mitk::MeasurementFrameProperty::New( mf ) );
 
     PropHelper propertyHelper( newImage );
     propertyHelper.InitializeImage();
   }
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   if (isOdf)
   {
     mitk::OdfImage::ItkOdfImageType::Pointer itk_img = mitk::OdfImage::ItkOdfImageType::New();
     mitk::CastToItkImage(newImage, itk_img);
 
     mitk::Image::Pointer odfImage = dynamic_cast<mitk::Image*>(mitk::OdfImage::New().GetPointer());
     mitk::CastToMitkImage(itk_img, odfImage);
     odfImage->SetVolume(itk_img->GetBufferPointer());
     imageNode->SetData( odfImage );
   }
   else if (isDti)
   {
     mitk::TensorImage::ItkTensorImageType::Pointer itk_img = mitk::ImageToItkImage<mitk::TensorImage::PixelType,3>(newImage);
     mitk::Image::Pointer tensorImage = dynamic_cast<mitk::Image*>(mitk::TensorImage::New().GetPointer());
     mitk::CastToMitkImage(itk_img, tensorImage);
     tensorImage->SetVolume(itk_img->GetBufferPointer());
     imageNode->SetData( tensorImage );
   }
   else if (isPeak)
   {
     mitk::PeakImage::ItkPeakImageType::Pointer itk_img = mitk::ImageToItkImage<float,4>(newImage);
     mitk::Image::Pointer peakImage = dynamic_cast<mitk::Image*>(mitk::PeakImage::New().GetPointer());
     mitk::CastToMitkImage(itk_img, peakImage);
     peakImage->SetVolume(itk_img->GetBufferPointer());
     imageNode->SetData( peakImage );
   }
   else
     imageNode->SetData( newImage );
 
   QString name = node->GetName().c_str();
   imageNode->SetName((name+"_newheader").toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
   mitk::RenderingManager::GetInstance()->InitializeViews( imageNode->GetData()->GetTimeGeometry(),
                                                           mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                           true );
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkPreprocessingView::DoProjectSignal()
 {
   switch(m_Controls->m_ProjectionMethodBox->currentIndex())
   {
     case 0:
       DoADCAverage();
     break;
     case 1:
       DoAKCFit();
     break;
     case 2:
       DoBiExpFit();
     break;
     default:
       DoADCAverage();
   }
 }
 
 void QmitkPreprocessingView::DoDwiNormalization()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( ! isDiffusionImage ) { return; }
 
   GradientDirectionContainerType::Pointer gradientContainer
       = static_cast<GradProp*>
         ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
           ->GetGradientDirectionsContainer();
 
   int b0Index = -1;
   for (unsigned int i=0; i<gradientContainer->size(); i++)
   {
     GradientDirectionType g = gradientContainer->GetElement(i);
     if (g.magnitude()<0.001)
     {
       b0Index = i;
       break;
     }
   }
   if (b0Index==-1) { return; }
 
   typedef itk::DwiNormilzationFilter<short>  FilterType;
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
 
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput( itkVectorImagePointer );
   filter->SetGradientDirections( static_cast<GradProp*>
                                  ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
                                    ->GetGradientDirectionsContainer() );
   filter->SetNewMean(m_Controls->m_NewMean->value());
   filter->SetNewStdev(m_Controls->m_NewStdev->value());
 
   UcharImageType::Pointer itkImage = nullptr;
   if (m_Controls->m_NormalizationMaskBox->GetSelectedNode().IsNotNull())
   {
     itkImage = UcharImageType::New();
     if (  dynamic_cast<mitk::Image*>(m_Controls->m_NormalizationMaskBox->GetSelectedNode()->GetData()) != nullptr )
     {
       mitk::CastToItkImage( dynamic_cast<mitk::Image*>(m_Controls->m_NormalizationMaskBox->GetSelectedNode()->GetData()), itkImage );
     }
     filter->SetMaskImage(itkImage);
   }
   filter->Update();
 
   mitk::Image::Pointer newImage = mitk::GrabItkImageMemory( filter->GetOutput() );
   PropHelper::CopyProperties(image, newImage, false);
   PropHelper propertyHelper( newImage );
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newImage );
   QString name = node->GetName().c_str();
 
   imageNode->SetName((name+"_normalized").toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 }
 
 void QmitkPreprocessingView::DoLengthCorrection()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( ! isDiffusionImage ) { return; }
 
   typedef itk::DwiGradientLengthCorrectionFilter  FilterType;
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
 
   FilterType::Pointer filter = FilterType::New();
   filter->SetRoundingValue( m_Controls->m_B_ValueMap_Rounder_SpinBox->value());
   filter->SetReferenceBValue( static_cast<mitk::FloatProperty*>
       (image->GetProperty(PropHelper::REFERENCEBVALUEPROPERTYNAME.c_str()).GetPointer() )
         ->GetValue() );
 
   filter->SetReferenceGradientDirectionContainer( static_cast<GradProp*>
       ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
         ->GetGradientDirectionsContainer() );
 
   filter->Update();
 
   mitk::Image::Pointer newImage = mitk::Image::New();
   newImage->InitializeByItk( itkVectorImagePointer.GetPointer() );
   newImage->SetImportVolume( itkVectorImagePointer->GetBufferPointer(), 0, 0, mitk::Image::CopyMemory);
   itkVectorImagePointer->GetPixelContainer()->ContainerManageMemoryOff();
 
   PropHelper::CopyProperties(image, newImage, true);
   newImage->GetPropertyList()->ReplaceProperty( PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str(), GradProp::New( filter->GetOutputGradientDirectionContainer() ) );
   newImage->GetPropertyList()->ReplaceProperty( PropHelper::REFERENCEBVALUEPROPERTYNAME.c_str(), mitk::FloatProperty::New( filter->GetNewBValue() ) );
   PropHelper propertyHelper( newImage );
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newImage );
   QString name = node->GetName().c_str();
 
   imageNode->SetName((name+"_rounded").toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 }
 
 void QmitkPreprocessingView::UpdateDwiBValueMapRounder(int i)
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(node) );
   if ( ! isDiffusionImage ) { return; }
 
   UpdateBValueTableWidget(i);
 }
 
 void QmitkPreprocessingView::
 CallMultishellToSingleShellFilter( itk::DWIVoxelFunctor * functor,
                                    mitk::Image::Pointer image,
                                    QString imageName,
                                    mitk::DataNode* parent )
 {
   typedef itk::RadialMultishellToSingleshellImageFilter<DiffusionPixelType, DiffusionPixelType> FilterType;
 
   // filter input parameter
   const mitk::BValueMapProperty::BValueMap& originalShellMap
       = static_cast<mitk::BValueMapProperty*>
         (image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )
           ->GetBValueMap();
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
   ItkDwiType* vectorImage = itkVectorImagePointer.GetPointer();
 
   const GradProp::GradientDirectionsContainerType::Pointer gradientContainer
       = static_cast<GradProp*>
         ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
           ->GetGradientDirectionsContainer();
 
   const unsigned int& bValue
       = static_cast<mitk::FloatProperty*>
         (image->GetProperty(PropHelper::REFERENCEBVALUEPROPERTYNAME.c_str()).GetPointer() )
           ->GetValue();
 
   mitk::DataNode::Pointer imageNode = 0;
 
   // filter call
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput(vectorImage);
   filter->SetOriginalGradientDirections(gradientContainer);
   filter->SetOriginalBValueMap(originalShellMap);
   filter->SetOriginalBValue(bValue);
   filter->SetFunctor(functor);
   filter->Update();
 
   // create new DWI image
   mitk::Image::Pointer outImage = mitk::GrabItkImageMemory( filter->GetOutput() );
   PropHelper::CopyProperties(image, outImage, true);
 
   outImage->GetPropertyList()->ReplaceProperty( PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str(),
                          GradProp::New( filter->GetTargetGradientDirections() ) );
 
   outImage->GetPropertyList()->ReplaceProperty( PropHelper::REFERENCEBVALUEPROPERTYNAME.c_str(),
                          mitk::FloatProperty::New( m_Controls->m_targetBValueSpinBox->value() ) );
 
   PropHelper propertyHelper( outImage );
   propertyHelper.InitializeImage();
 
   imageNode = mitk::DataNode::New();
   imageNode->SetData( outImage );
   imageNode->SetName(imageName.toStdString().c_str());
   GetDataStorage()->Add(imageNode, parent);
 
   //  if(m_Controls->m_OutputRMSErrorImage->isChecked()){
   //    // create new Error image
   //    FilterType::ErrorImageType::Pointer errImage = filter->GetErrorImage();
   //    mitk::Image::Pointer mitkErrImage = mitk::Image::New();
   //    mitkErrImage->InitializeByItk<FilterType::ErrorImageType>(errImage);
   //    mitkErrImage->SetVolume(errImage->GetBufferPointer());
 
   //    imageNode = mitk::DataNode::New();
   //    imageNode->SetData( mitkErrImage );
   //    imageNode->SetName((imageName+"_Error").toStdString().c_str());
   //    GetDataStorage()->Add(imageNode);
   //  }
 }
 
 void QmitkPreprocessingView::DoBiExpFit()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( ! isDiffusionImage ) { return; }
 
   itk::BiExpFitFunctor::Pointer functor = itk::BiExpFitFunctor::New();
 
   QString name(node->GetName().c_str());
 
   const mitk::BValueMapProperty::BValueMap& originalShellMap
       = static_cast<mitk::BValueMapProperty*>
         (image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )
           ->GetBValueMap();
 
   mitk::BValueMapProperty::BValueMap::const_iterator it = originalShellMap.begin();
   ++it;/* skip b=0*/ unsigned int s = 0; /*shell index */
   vnl_vector<double> bValueList(originalShellMap.size()-1);
 
   while( it != originalShellMap.end() ) { bValueList.put(s++,(it++)->first); }
 
   const double targetBValue = m_Controls->m_targetBValueSpinBox->value();
   functor->setListOfBValues(bValueList);
   functor->setTargetBValue(targetBValue);
   CallMultishellToSingleShellFilter(functor,image,name + "_BiExp", node);
 }
 
 void QmitkPreprocessingView::DoAKCFit()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( ! isDiffusionImage ) { return; }
 
   itk::KurtosisFitFunctor::Pointer functor = itk::KurtosisFitFunctor::New();
 
   QString name(node->GetName().c_str());
 
   const mitk::BValueMapProperty::BValueMap& originalShellMap
       = static_cast<mitk::BValueMapProperty*>
         (image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )
           ->GetBValueMap();
 
   mitk::BValueMapProperty::BValueMap::const_iterator it = originalShellMap.begin();
   ++it;/* skip b=0*/ unsigned int s = 0; /*shell index */
   vnl_vector<double> bValueList(originalShellMap.size()-1);
   while(it != originalShellMap.end())
     bValueList.put(s++,(it++)->first);
 
   const double targetBValue = m_Controls->m_targetBValueSpinBox->value();
   functor->setListOfBValues(bValueList);
   functor->setTargetBValue(targetBValue);
   CallMultishellToSingleShellFilter(functor,image,name + "_AKC", node);
 }
 
 void QmitkPreprocessingView::DoADCFit()
 {
   // later
 }
 
 void QmitkPreprocessingView::DoADCAverage()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( ! isDiffusionImage )
     return;
 
   itk::ADCAverageFunctor::Pointer functor = itk::ADCAverageFunctor::New();
 
   QString name(node->GetName().c_str());
 
   const mitk::BValueMapProperty::BValueMap
       &originalShellMap  = static_cast<mitk::BValueMapProperty*>(image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )->GetBValueMap();
 
   mitk::BValueMapProperty::BValueMap::const_iterator it = originalShellMap.begin();
   ++it;/* skip b=0*/ unsigned int s = 0; /*shell index */
   vnl_vector<double> bValueList(originalShellMap.size()-1);
   while(it != originalShellMap.end())
     bValueList.put(s++,(it++)->first);
 
   const double targetBValue = m_Controls->m_targetBValueSpinBox->value();
   functor->setListOfBValues(bValueList);
   functor->setTargetBValue(targetBValue);
   CallMultishellToSingleShellFilter(functor,image,name + "_ADC", node);
 }
 
 void QmitkPreprocessingView::CleanBValueTableWidget()
 {
   m_Controls->m_B_ValueMap_TableWidget->clear();
   m_Controls->m_B_ValueMap_TableWidget->setRowCount(1);
   QStringList headerList;
   headerList << "b-Value" << "Number of gradients";
   m_Controls->m_B_ValueMap_TableWidget->setHorizontalHeaderLabels(headerList);
   m_Controls->m_B_ValueMap_TableWidget->setItem(0,0,new QTableWidgetItem("-"));
   m_Controls->m_B_ValueMap_TableWidget->setItem(0,1,new QTableWidgetItem("-"));
 }
 
 void QmitkPreprocessingView::UpdateBValueTableWidget(int)
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
 
   if (node.IsNull())
   {
     CleanBValueTableWidget();
     return;
   }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage(false);
 
   isDiffusionImage = PropHelper::IsDiffusionWeightedImage(image);
 
   if ( ! isDiffusionImage )
   {
     CleanBValueTableWidget();
   }
   else
   {
     typedef mitk::BValueMapProperty::BValueMap BValueMap;
     typedef mitk::BValueMapProperty::BValueMap::iterator BValueMapIterator;
 
     BValueMapIterator it;
 
     BValueMap roundedBValueMap = static_cast<mitk::BValueMapProperty*>
         (image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )
           ->GetBValueMap();
 
     m_Controls->m_B_ValueMap_TableWidget->clear();
     m_Controls->m_B_ValueMap_TableWidget->setRowCount(roundedBValueMap.size() );
     QStringList headerList;
     headerList << "b-Value" << "Number of gradients";
     m_Controls->m_B_ValueMap_TableWidget->setHorizontalHeaderLabels(headerList);
 
     int i = 0 ;
     for(it = roundedBValueMap.begin() ;it != roundedBValueMap.end(); it++)
     {
       m_Controls->m_B_ValueMap_TableWidget->setItem(i,0,new QTableWidgetItem(QString::number(it->first)));
       QTableWidgetItem* item = m_Controls->m_B_ValueMap_TableWidget->item(i,0);
       item->setFlags(item->flags() & ~Qt::ItemIsEditable);
       m_Controls->m_B_ValueMap_TableWidget->setItem(i,1,new QTableWidgetItem(QString::number(it->second.size())));
       i++;
     }
   }
 }
 
 void QmitkPreprocessingView::OnSelectionChanged(berry::IWorkbenchPart::Pointer , const QList<mitk::DataNode::Pointer>& nodes)
 {
   (void) nodes;
   this->OnImageSelectionChanged();
 }
 
 void QmitkPreprocessingView::OnImageSelectionChanged()
 {
   for (int r=0; r<3; r++)
     for (int c=0; c<3; c++)
     {
       {
         QTableWidgetItem* item = m_Controls->m_MeasurementFrameTable->item( r, c );
         delete item;
         item = new QTableWidgetItem();
         m_Controls->m_MeasurementFrameTable->setItem( r, c, item );
       }
       {
         QTableWidgetItem* item = m_Controls->m_DirectionMatrixTable->item( r, c );
         delete item;
         item = new QTableWidgetItem();
         m_Controls->m_DirectionMatrixTable->setItem( r, c, item );
       }
     }
 
   bool foundImageVolume = true;
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   bool foundDwiVolume( PropHelper::IsDiffusionWeightedImage( node ) );
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool multiComponentVolume = (image->GetPixelType().GetNumberOfComponents() > 1);
   bool threeDplusTVolume = (image->GetTimeSteps() > 1);
 
   m_Controls->m_ButtonAverageGradients->setEnabled(foundDwiVolume);
   m_Controls->m_ButtonExtractB0->setEnabled(foundDwiVolume);
   m_Controls->m_CheckExtractAll->setEnabled(foundDwiVolume);
   m_Controls->m_MeasurementFrameTable->setEnabled(foundDwiVolume);
   m_Controls->m_ReduceGradientsButton->setEnabled(foundDwiVolume);
   m_Controls->m_ShowGradientsButton->setEnabled(foundDwiVolume);
   m_Controls->m_MirrorGradientToHalfSphereButton->setEnabled(foundDwiVolume);
   m_Controls->m_MergeDwisButton->setEnabled(foundDwiVolume);
   m_Controls->m_B_ValueMap_Rounder_SpinBox->setEnabled(foundDwiVolume);
   m_Controls->m_ProjectSignalButton->setEnabled(foundDwiVolume);
   m_Controls->m_CreateLengthCorrectedDwi->setEnabled(foundDwiVolume);
   m_Controls->m_targetBValueSpinBox->setEnabled(foundDwiVolume);
   m_Controls->m_NormalizeImageValuesButton->setEnabled(foundDwiVolume);
   m_Controls->m_RemoveGradientButton->setEnabled(foundDwiVolume);
   m_Controls->m_ExtractGradientButton->setEnabled(foundDwiVolume);
   m_Controls->m_FlipGradientsButton->setEnabled(foundDwiVolume);
   m_Controls->m_ClearRotationButton->setEnabled(foundDwiVolume);
 
   m_Controls->m_DirectionMatrixTable->setEnabled(foundImageVolume);
   m_Controls->m_ModifyHeader->setEnabled(foundImageVolume);
   m_Controls->m_AlignImageBox->setEnabled(foundImageVolume);
 
   // we do not support multi-component and 3D+t images for certain operations
   bool foundSingleImageVolume = foundDwiVolume || (foundImageVolume && !(multiComponentVolume || threeDplusTVolume));
   m_Controls->m_FlipAxis->setEnabled(foundSingleImageVolume);
   m_Controls->m_CropImageButton->setEnabled(foundSingleImageVolume);
   m_Controls->m_ExtractBrainMask->setEnabled(foundSingleImageVolume);
   m_Controls->m_ResampleImageButton->setEnabled(foundSingleImageVolume);
 
   // reset sampling frame to 1 and update all ealted components
   m_Controls->m_B_ValueMap_Rounder_SpinBox->setValue(1);
 
   UpdateBValueTableWidget(m_Controls->m_B_ValueMap_Rounder_SpinBox->value());
   DoUpdateInterpolationGui(m_Controls->m_ResampleTypeBox->currentIndex());
 
   m_Controls->m_HeaderSpacingX->setValue(image->GetGeometry()->GetSpacing()[0]);
   m_Controls->m_HeaderSpacingY->setValue(image->GetGeometry()->GetSpacing()[1]);
   m_Controls->m_HeaderSpacingZ->setValue(image->GetGeometry()->GetSpacing()[2]);
   m_Controls->m_HeaderOriginX->setValue(image->GetGeometry()->GetOrigin()[0]);
   m_Controls->m_HeaderOriginY->setValue(image->GetGeometry()->GetOrigin()[1]);
   m_Controls->m_HeaderOriginZ->setValue(image->GetGeometry()->GetOrigin()[2]);
   m_Controls->m_XstartBox->setMaximum(image->GetGeometry()->GetExtent(0)-1);
   m_Controls->m_YstartBox->setMaximum(image->GetGeometry()->GetExtent(1)-1);
   m_Controls->m_ZstartBox->setMaximum(image->GetGeometry()->GetExtent(2)-1);
   m_Controls->m_XendBox->setMaximum(image->GetGeometry()->GetExtent(0)-1);
   m_Controls->m_YendBox->setMaximum(image->GetGeometry()->GetExtent(1)-1);
   m_Controls->m_ZendBox->setMaximum(image->GetGeometry()->GetExtent(2)-1);
 
   for (int r=0; r<3; r++)
     for (int c=0; c<3; c++)
     {
       // Direction matrix
       QTableWidgetItem* item = m_Controls->m_DirectionMatrixTable->item( r, c );
       delete item;
       item = new QTableWidgetItem();
       item->setTextAlignment(Qt::AlignCenter | Qt::AlignVCenter);
       double val = image->GetGeometry()->GetVtkMatrix()->GetElement(r,c)/image->GetGeometry()->GetSpacing()[c];
       item->setText(QString::number(val));
       m_Controls->m_DirectionMatrixTable->setItem( r, c, item );
     }
 
   if (foundDwiVolume)
   {
     m_Controls->m_InputData->setTitle("Input Data");
     vnl_matrix_fixed< double, 3, 3 >  mf
         = static_cast<mitk::MeasurementFrameProperty*>
           (image->GetProperty(PropHelper::MEASUREMENTFRAMEPROPERTYNAME.c_str()).GetPointer() )
             ->GetMeasurementFrame();
 
     for (int r=0; r<3; r++)
       for (int c=0; c<3; c++)
       {
         // Measurement frame
         QTableWidgetItem* item = m_Controls->m_MeasurementFrameTable->item( r, c );
         delete item;
         item = new QTableWidgetItem();
         item->setTextAlignment(Qt::AlignCenter | Qt::AlignVCenter);
         item->setText(QString::number(mf.get(r,c)));
         m_Controls->m_MeasurementFrameTable->setItem( r, c, item );
       }
 
     //calculate target bValue for MultishellToSingleShellfilter
     const mitk::BValueMapProperty::BValueMap & bValMap
         = static_cast<mitk::BValueMapProperty*>
           (image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )
             ->GetBValueMap();
 
     mitk::BValueMapProperty::BValueMap::const_iterator it = bValMap.begin();
     unsigned int targetBVal = 0;
     while(it != bValMap.end()) { targetBVal += (it++)->first; }
 
     targetBVal /= (float)bValMap.size()-1;
     m_Controls->m_targetBValueSpinBox->setValue(targetBVal);
 
     m_Controls->m_RemoveGradientBox->setMaximum(static_cast<GradProp*>
       ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
         ->GetGradientDirectionsContainer()->Size()-1);
 
     m_Controls->m_ExtractGradientBox->setMaximum(static_cast<GradProp*>
       ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
         ->GetGradientDirectionsContainer()->Size()-1);
   }
 
 }
 
 
 void QmitkPreprocessingView::Activated()
 {
 }
 
 void QmitkPreprocessingView::Deactivated()
 {
   OnImageSelectionChanged();
 }
 
 void QmitkPreprocessingView::Visible()
 {
   OnImageSelectionChanged();
 }
 
 void QmitkPreprocessingView::Hidden()
 {
 }
 
 void QmitkPreprocessingView::DoClearRotationOfGradients()
 {
 
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull())
     return;
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if (image == nullptr)
     return;
 
   if(!PropHelper::IsDiffusionWeightedImage(image))
     return;
 
   mitk::Image::Pointer newDwi = image->Clone();
 
   PropHelper propertyHelper( newDwi );
   propertyHelper.InitializeImage();
   PropHelper::ClearMeasurementFrameAndRotationMatrixFromGradients(newDwi);
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newDwi );
 
   QString name = node->GetName().c_str();
   imageNode->SetName( (name+"_OriginalGradients").toStdString().c_str() );
   GetDataStorage()->Add( imageNode, node );
 
 }
 
 void QmitkPreprocessingView::DoFlipGradientDirections()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   mitk::Image::Pointer newDwi = image->Clone();
 
   GradientDirectionContainerType::Pointer gradientContainer =
     static_cast<GradProp*>
       ( newDwi->GetProperty(PropHelper::ORIGINALGRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
         ->GetGradientDirectionsContainer();
 
   for (unsigned int j=0; j<gradientContainer->Size(); j++)
   {
       if (m_Controls->m_FlipGradBoxX->isChecked()) { gradientContainer->at(j)[0] *= -1; }
       if (m_Controls->m_FlipGradBoxY->isChecked()) { gradientContainer->at(j)[1] *= -1; }
       if (m_Controls->m_FlipGradBoxZ->isChecked()) { gradientContainer->at(j)[2] *= -1; }
   }
 
   PropHelper::CopyProperties(image, newDwi, true);
   newDwi->GetPropertyList()->ReplaceProperty( PropHelper::ORIGINALGRADIENTCONTAINERPROPERTYNAME.c_str(), GradProp::New( gradientContainer ) );
   PropHelper propertyHelper( newDwi );
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newDwi );
 
   QString name = node->GetName().c_str();
   imageNode->SetName( (name+"_GradientFlip").toStdString().c_str() );
   GetDataStorage()->Add( imageNode, node );
 }
 
 void QmitkPreprocessingView::DoHalfSphereGradientDirections()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   mitk::Image::Pointer newDwi = image->Clone();
   GradientDirectionContainerType::Pointer gradientContainer =
     static_cast<GradProp*>
       ( newDwi->GetProperty(PropHelper::ORIGINALGRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
         ->GetGradientDirectionsContainer();
 
   for (unsigned int j=0; j<gradientContainer->Size(); j++)
   {
     if (gradientContainer->at(j)[0]<0) { gradientContainer->at(j) = -gradientContainer->at(j); }
   }
 
   PropHelper::CopyProperties(image, newDwi, true);
   newDwi->GetPropertyList()->ReplaceProperty( PropHelper::ORIGINALGRADIENTCONTAINERPROPERTYNAME.c_str(), GradProp::New( gradientContainer ) );
   PropHelper propertyHelper( newDwi );
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newDwi );
 
   QString name = node->GetName().c_str();
   imageNode->SetName( (name+"_halfsphere").toStdString().c_str() );
   GetDataStorage()->Add( imageNode, node );
 }
 
 void QmitkPreprocessingView::DoShowGradientDirections()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage ) { return; }
 
   int maxIndex = 0;
   unsigned int maxSize = image->GetDimension(0);
   if (maxSize<image->GetDimension(1))
   {
     maxSize = image->GetDimension(1);
     maxIndex = 1;
   }
   if (maxSize<image->GetDimension(2))
   {
     maxSize = image->GetDimension(2);
     maxIndex = 2;
   }
 
   mitk::Point3D origin = image->GetGeometry()->GetOrigin();
   mitk::PointSet::Pointer originSet = mitk::PointSet::New();
 
   typedef mitk::BValueMapProperty::BValueMap BValueMap;
   typedef mitk::BValueMapProperty::BValueMap::iterator BValueMapIterator;
   BValueMap bValMap =  static_cast<mitk::BValueMapProperty*>
     (image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )
       ->GetBValueMap();
 
   GradientDirectionContainerType::Pointer gradientContainer = static_cast<GradProp*>
     ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
       ->GetGradientDirectionsContainer();
 
   mitk::BaseGeometry::Pointer geometry = image->GetGeometry();
   int shellCount = 1;
 
   for(BValueMapIterator it = bValMap.begin(); it!=bValMap.end(); ++it)
   {
     mitk::PointSet::Pointer pointset = mitk::PointSet::New();
     for (unsigned int j=0; j<it->second.size(); j++)
     {
       mitk::Point3D ip;
       vnl_vector_fixed< double, 3 > v = gradientContainer->at(it->second[j]);
       if (v.magnitude()>mitk::eps)
       {
         ip[0] = v[0]*maxSize*geometry->GetSpacing()[maxIndex]/2
                 + origin[0]-0.5*geometry->GetSpacing()[0]
                 + geometry->GetSpacing()[0]*image->GetDimension(0)/2;
 
         ip[1] = v[1]*maxSize*geometry->GetSpacing()[maxIndex]/2
                 + origin[1]-0.5*geometry->GetSpacing()[1]
                 + geometry->GetSpacing()[1]*image->GetDimension(1)/2;
 
         ip[2] = v[2]*maxSize*geometry->GetSpacing()[maxIndex]/2
                 + origin[2]-0.5*geometry->GetSpacing()[2]
                 + geometry->GetSpacing()[2]*image->GetDimension(2)/2;
 
         pointset->InsertPoint(j, ip);
       }
       else if (originSet->IsEmpty())
       {
         ip[0] = v[0]*maxSize*geometry->GetSpacing()[maxIndex]/2
                 + origin[0]-0.5*geometry->GetSpacing()[0]
                 + geometry->GetSpacing()[0]*image->GetDimension(0)/2;
 
         ip[1] = v[1]*maxSize*geometry->GetSpacing()[maxIndex]/2
                 + origin[1]-0.5*geometry->GetSpacing()[1]
                 + geometry->GetSpacing()[1]*image->GetDimension(1)/2;
 
         ip[2] = v[2]*maxSize*geometry->GetSpacing()[maxIndex]/2
                 + origin[2]-0.5*geometry->GetSpacing()[2]
                 + geometry->GetSpacing()[2]*image->GetDimension(2)/2;
 
         originSet->InsertPoint(j, ip);
       }
     }
     if ( it->first < mitk::eps ) { continue; }
 
     // add shell to datastorage
     mitk::DataNode::Pointer newNode = mitk::DataNode::New();
     newNode->SetData(pointset);
 
     QString name = node->GetName().c_str();
     name += "_Shell_";
     name += QString::number( it->first );
     newNode->SetName( name.toStdString().c_str() );
     newNode->SetProperty( "pointsize", mitk::FloatProperty::New((float)maxSize / 50) );
 
     int b0 = shellCount % 2;
     int b1 = 0;
     int b2 = 0;
     if (shellCount>4) { b2 = 1; }
 
     if (shellCount%4 >= 2) { b1 = 1; }
 
     newNode->SetProperty("color", mitk::ColorProperty::New( b2, b1, b0 ));
     GetDataStorage()->Add( newNode, node );
     shellCount++;
   }
 
   // add origin to datastorage
   mitk::DataNode::Pointer newNode = mitk::DataNode::New();
   newNode->SetData(originSet);
 
   QString name = node->GetName().c_str();
   name += "_Origin";
   newNode->SetName(name.toStdString().c_str());
   newNode->SetProperty("pointsize", mitk::FloatProperty::New((float)maxSize/50));
   newNode->SetProperty("color", mitk::ColorProperty::New(1,1,1));
   GetDataStorage()->Add(newNode, node);
 }
 
 void QmitkPreprocessingView::DoReduceGradientDirections()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage ) { return; }
 
   typedef itk::ElectrostaticRepulsionDiffusionGradientReductionFilter<DiffusionPixelType, DiffusionPixelType> FilterType;
   typedef mitk::BValueMapProperty::BValueMap BValueMap;
 
   // GetShellSelection from GUI
   BValueMap shellSlectionMap;
   BValueMap originalShellMap = static_cast<mitk::BValueMapProperty*>
     (image->GetProperty(PropHelper::BVALUEMAPPROPERTYNAME.c_str()).GetPointer() )
       ->GetBValueMap();
 
   std::vector<unsigned int> newNumGradientDirections;
   int shellCounter = 0;
 
   QString name = node->GetName().c_str();
   for (int i=0; i<m_Controls->m_B_ValueMap_TableWidget->rowCount(); i++)
   {
     double BValue = m_Controls->m_B_ValueMap_TableWidget->item(i,0)->text().toDouble();
     shellSlectionMap[BValue] = originalShellMap[BValue];
     unsigned int num = m_Controls->m_B_ValueMap_TableWidget->item(i,1)->text().toUInt();
     newNumGradientDirections.push_back(num);
     name += "_";
     name += QString::number(num);
     shellCounter++;
   }
 
   if (newNumGradientDirections.empty()) { return; }
 
   GradientDirectionContainerType::Pointer gradientContainer
       = static_cast<GradProp*>
         ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
           ->GetGradientDirectionsContainer();
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
 
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput( itkVectorImagePointer );
   filter->SetOriginalGradientDirections(gradientContainer);
   filter->SetNumGradientDirections(newNumGradientDirections);
   filter->SetOriginalBValueMap(originalShellMap);
   filter->SetShellSelectionBValueMap(shellSlectionMap);
   filter->Update();
 
   mitk::Image::Pointer newImage = mitk::GrabItkImageMemory( filter->GetOutput() );
   PropHelper::CopyProperties(image, newImage, true);
   newImage->GetPropertyList()->ReplaceProperty( PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str(), GradProp::New( filter->GetGradientDirections() ) );
   PropHelper propertyHelper( newImage );
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newImage );
 
   imageNode->SetName(name.toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 
   // update the b-value widget to remove the modified number of gradients used for extraction
   this->CleanBValueTableWidget();
   this->UpdateBValueTableWidget(0);
 }
 
 void QmitkPreprocessingView::MergeDwis()
 {
   typedef GradProp::GradientDirectionsContainerType GradientContainerType;
 
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage ) { return; }
 
   mitk::DataNode::Pointer node2 = m_Controls->m_MergeDwiBox->GetSelectedNode();
   if (node2.IsNull()) { return; }
 
   mitk::Image::Pointer image2 = dynamic_cast<mitk::Image*>(node2->GetData());
   if ( image2 == nullptr ) { return; }
 
   typedef itk::VectorImage<DiffusionPixelType,3> DwiImageType;
   typedef std::vector< DwiImageType::Pointer >   DwiImageContainerType;
 
   typedef std::vector< GradientContainerType::Pointer >  GradientListContainerType;
 
   DwiImageContainerType       imageContainer;
   GradientListContainerType   gradientListContainer;
   std::vector< double >       bValueContainer;
 
   QString name = "";
   {
     ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
     mitk::CastToItkImage(image, itkVectorImagePointer);
 
     imageContainer.push_back( itkVectorImagePointer );
     gradientListContainer.push_back( static_cast<GradProp*>
         ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
           ->GetGradientDirectionsContainer() );
 
     bValueContainer.push_back( static_cast<mitk::FloatProperty*>
         (image->GetProperty(PropHelper::REFERENCEBVALUEPROPERTYNAME.c_str()).GetPointer() )
           ->GetValue() );
 
     name += node->GetName().c_str();
   }
 
   {
     ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
     mitk::CastToItkImage(image2, itkVectorImagePointer);
 
     imageContainer.push_back( itkVectorImagePointer );
     gradientListContainer.push_back( static_cast<GradProp*>
         ( image2->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
           ->GetGradientDirectionsContainer() );
 
     bValueContainer.push_back( static_cast<mitk::FloatProperty*>
         (image2->GetProperty(PropHelper::REFERENCEBVALUEPROPERTYNAME.c_str()).GetPointer() )
           ->GetValue() );
 
     name += "+";
     name += node2->GetName().c_str();
   }
 
   typedef itk::MergeDiffusionImagesFilter<short> FilterType;
   FilterType::Pointer filter = FilterType::New();
   filter->SetImageVolumes(imageContainer);
   filter->SetGradientLists(gradientListContainer);
   filter->SetBValues(bValueContainer);
   filter->Update();
 
   vnl_matrix_fixed< double, 3, 3 > mf; mf.set_identity();
   mitk::Image::Pointer newImage = mitk::GrabItkImageMemory( filter->GetOutput() );
 
   newImage->GetPropertyList()->ReplaceProperty( PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str(), GradProp::New( filter->GetOutputGradients() ) );
   newImage->GetPropertyList()->ReplaceProperty( PropHelper::MEASUREMENTFRAMEPROPERTYNAME.c_str(), mitk::MeasurementFrameProperty::New( mf ) );
   newImage->GetPropertyList()->ReplaceProperty( PropHelper::REFERENCEBVALUEPROPERTYNAME.c_str(), mitk::FloatProperty::New( filter->GetB_Value() ) );
 
   PropHelper propertyHelper( newImage );
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newImage );
   imageNode->SetName(name.toStdString().c_str());
   GetDataStorage()->Add(imageNode);
 }
 
 void QmitkPreprocessingView::ExtractB0()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage ) { return; }
 
   // call the extraction withou averaging if the check-box is checked
   if( this->m_Controls->m_CheckExtractAll->isChecked() )
   {
     DoExtractBOWithoutAveraging();
     return;
   }
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
 
   // Extract image using found index
   typedef itk::B0ImageExtractionImageFilter<short, short> FilterType;
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput( itkVectorImagePointer );
   filter->SetDirections( static_cast<GradProp*>
       ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
         ->GetGradientDirectionsContainer() );
 
   filter->Update();
 
   mitk::Image::Pointer mitkImage = mitk::Image::New();
   mitkImage->InitializeByItk( filter->GetOutput() );
   mitkImage->SetVolume( filter->GetOutput()->GetBufferPointer() );
   mitk::DataNode::Pointer newNode=mitk::DataNode::New();
   newNode->SetData( mitkImage );
   newNode->SetProperty( "name", mitk::StringProperty::New(node->GetName() + "_B0"));
 
   GetDataStorage()->Add(newNode, node);
 }
 
 void QmitkPreprocessingView::DoExtractBOWithoutAveraging()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage ) { return; }
 
   // typedefs
   typedef itk::B0ImageExtractionToSeparateImageFilter< short, short> FilterType;
 
   ItkDwiType::Pointer itkVectorImagePointer = ItkDwiType::New();
   mitk::CastToItkImage(image, itkVectorImagePointer);
 
   // Extract image using found index
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput( itkVectorImagePointer );
   filter->SetDirections( static_cast<GradProp*>
       ( image->GetProperty(PropHelper::GRADIENTCONTAINERPROPERTYNAME.c_str()).GetPointer() )
         ->GetGradientDirectionsContainer() );
 
   filter->Update();
 
   mitk::Image::Pointer mitkImage = mitk::Image::New();
   mitkImage->InitializeByItk( filter->GetOutput() );
   mitkImage->SetImportChannel( filter->GetOutput()->GetBufferPointer() );
   mitk::DataNode::Pointer newNode=mitk::DataNode::New();
   newNode->SetData( mitkImage );
   newNode->SetProperty( "name", mitk::StringProperty::New(node->GetName() + "_B0_ALL"));
 
   GetDataStorage()->Add(newNode, node);
 
   /*A reinitialization is needed to access the time channels via the ImageNavigationController
     The Global-Geometry can not recognize the time channel without a re-init.
     (for a new selection in datamanger a automatically updated of the Global-Geometry should be done
     - if it contains the time channel)*/
   mitk::RenderingManager::GetInstance()->InitializeViews( newNode->GetData()->GetTimeGeometry(),
                                                           mitk::RenderingManager::REQUEST_UPDATE_ALL,
                                                           true);
 }
 
 void QmitkPreprocessingView::AverageGradients()
 {
   mitk::DataNode::Pointer node = m_Controls->m_SelctedImageComboBox->GetSelectedNode();
   if (node.IsNull()) { return; }
 
   mitk::Image::Pointer image = dynamic_cast<mitk::Image*>(node->GetData());
   if ( image == nullptr ) { return; }
 
   bool isDiffusionImage( PropHelper::IsDiffusionWeightedImage(image) );
   if ( !isDiffusionImage )
     return;
 
   mitk::Image::Pointer newDwi = image->Clone();
   PropHelper propertyHelper(newDwi);
   propertyHelper.AverageRedundantGradients(m_Controls->m_Blur->value());
   propertyHelper.InitializeImage();
 
   mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
   imageNode->SetData( newDwi );
   QString name = node->GetName().c_str();
   imageNode->SetName((name+"_averaged").toStdString().c_str());
   GetDataStorage()->Add(imageNode, node);
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingViewControls.ui
index 537943f4cd..e386ad0ad0 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingViewControls.ui
@@ -1,1717 +1,1720 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkPreprocessingViewControls</class>
  <widget class="QWidget" name="QmitkPreprocessingViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>503</width>
     <height>812</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="acceptDrops">
    <bool>false</bool>
   </property>
   <property name="windowTitle">
    <string>QmitkPreprocessingViewControls</string>
   </property>
   <property name="autoFillBackground">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_18">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="m_InputData">
      <property name="title">
       <string>Please Select Input Data</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_5">
         <property name="toolTip">
          <string/>
         </property>
         <property name="text">
          <string>Image:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QmitkDataStorageComboBox" name="m_SelctedImageComboBox">
         <property name="sizeAdjustPolicy">
          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">
        <string>Gradients</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_6">
        <item row="6" column="0">
         <spacer name="verticalSpacer_5">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="0">
         <widget class="QTableWidget" name="m_B_ValueMap_TableWidget">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="verticalScrollBarPolicy">
           <enum>Qt::ScrollBarAsNeeded</enum>
          </property>
          <property name="horizontalScrollBarPolicy">
           <enum>Qt::ScrollBarAlwaysOff</enum>
          </property>
          <attribute name="horizontalHeaderCascadingSectionResizes">
           <bool>true</bool>
          </attribute>
          <attribute name="horizontalHeaderDefaultSectionSize">
           <number>100</number>
          </attribute>
          <attribute name="horizontalHeaderStretchLastSection">
           <bool>true</bool>
          </attribute>
          <attribute name="verticalHeaderVisible">
           <bool>false</bool>
          </attribute>
          <attribute name="verticalHeaderCascadingSectionResizes">
           <bool>true</bool>
          </attribute>
          <column>
           <property name="text">
            <string>b-Value</string>
           </property>
          </column>
          <column>
           <property name="text">
            <string>Number of gradients</string>
           </property>
          </column>
         </widget>
        </item>
        <item row="3" column="0" rowspan="2">
         <widget class="QFrame" name="frame_2">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_10">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <property name="horizontalSpacing">
            <number>6</number>
           </property>
           <item row="3" column="1">
            <layout class="QFormLayout" name="formLayout">
             <item row="0" column="0">
              <widget class="QLabel" name="label_2">
               <property name="toolTip">
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Define the sampling frame the b-Values are rounded with.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="text">
                <string>Sampling frame:</string>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="QSpinBox" name="m_B_ValueMap_Rounder_SpinBox">
               <property name="enabled">
                <bool>false</bool>
               </property>
               <property name="toolTip">
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Round b-values to nearest multiple of this value (click &amp;quot;Round b-value&amp;quot; to create new image with these values).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="correctionMode">
                <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
               </property>
               <property name="minimum">
                <number>1</number>
               </property>
               <property name="maximum">
                <number>10000</number>
               </property>
               <property name="singleStep">
                <number>10</number>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item row="6" column="0">
            <widget class="QCommandLinkButton" name="m_MirrorGradientToHalfSphereButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Sometimes the gradient directions are not located on one half sphere.</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Mirror gradients to half sphere</string>
             </property>
            </widget>
           </item>
           <item row="5" column="0">
            <widget class="QCommandLinkButton" name="m_ShowGradientsButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Generate pointset displaying the gradient vectors (applied measurement frame).</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Show gradients</string>
             </property>
            </widget>
           </item>
           <item row="4" column="0">
            <widget class="QCommandLinkButton" name="m_FlipGradientsButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Generate pointset displaying the gradient vectors (applied measurement frame).</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Flip gradients</string>
             </property>
            </widget>
           </item>
           <item row="8" column="0">
            <widget class="QCommandLinkButton" name="m_ReduceGradientsButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Retain only the specified number of gradient directions and according image volumes. The retained directions are spread equally over the half sphere using an iterative energy repulsion strategy.</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Reduce number of gradients</string>
             </property>
            </widget>
           </item>
           <item row="4" column="1">
            <widget class="QFrame" name="frame_8">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Plain</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_21">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
               <number>0</number>
              </property>
              <item row="0" column="0">
               <widget class="QCheckBox" name="m_FlipGradBoxX">
                <property name="text">
                 <string>x</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QCheckBox" name="m_FlipGradBoxY">
                <property name="text">
                 <string>y</string>
                </property>
               </widget>
              </item>
              <item row="0" column="2">
               <widget class="QCheckBox" name="m_FlipGradBoxZ">
                <property name="text">
                 <string>z</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QCommandLinkButton" name="m_CreateLengthCorrectedDwi">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="text">
              <string>Round b-values</string>
             </property>
            </widget>
           </item>
           <item row="9" column="0">
            <widget class="QCommandLinkButton" name="m_ClearRotationButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>By default, the image matrix is applied to the image gradients. This button removes this additional rotation.</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Clear rotation of gradients</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="5" column="0">
         <widget class="QGroupBox" name="groupBox_6">
          <property name="title">
           <string>Remove or extract gradient volumes</string>
          </property>
          <layout class="QFormLayout" name="formLayout_3">
           <property name="horizontalSpacing">
            <number>6</number>
           </property>
           <property name="verticalSpacing">
            <number>6</number>
           </property>
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="0">
            <widget class="QCommandLinkButton" name="m_RemoveGradientButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="text">
              <string>Remove gradient volume</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="m_RemoveGradientBox"/>
           </item>
           <item row="1" column="0">
            <widget class="QCommandLinkButton" name="m_ExtractGradientButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="text">
              <string>Extract gradient volume</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QSpinBox" name="m_ExtractGradientBox"/>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_5">
       <attribute name="title">
        <string>Image Values</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_8">
        <item row="3" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="0">
         <widget class="QFrame" name="frame_3">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_11">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <property name="horizontalSpacing">
            <number>0</number>
           </property>
           <item row="1" column="1">
            <widget class="QFrame" name="frame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QFormLayout" name="formLayout_2">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item row="0" column="1">
               <widget class="QDoubleSpinBox" name="m_Blur">
                <property name="toolTip">
                 <string comment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured." extracomment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.">Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.</string>
                </property>
                <property name="statusTip">
                 <string comment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured." extracomment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.">Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.</string>
                </property>
                <property name="whatsThis">
                 <string comment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured." extracomment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.">Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.</string>
                </property>
                <property name="decimals">
                 <number>6</number>
                </property>
                <property name="maximum">
                 <double>2.000000000000000</double>
                </property>
                <property name="singleStep">
                 <double>0.000100000000000</double>
                </property>
                <property name="value">
                 <double>0.001000000000000</double>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
               <widget class="QLabel" name="label">
                <property name="toolTip">
                 <string comment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured." extracomment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.">Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.</string>
                </property>
                <property name="statusTip">
                 <string comment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured." extracomment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.">Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.</string>
                </property>
                <property name="whatsThis">
                 <string comment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured." extracomment="Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.">Accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a &quot;Merge radius&quot; &gt; 0 is configured.</string>
                </property>
                <property name="text">
                 <string>Merge radius</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="6" column="0">
            <widget class="QCommandLinkButton" name="m_MergeDwisButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Merges selected DWIs of same dimension. If several b-values are present, the resulting image will contain multiple b-shells.</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Merge selected DWIs</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QCommandLinkButton" name="m_NormalizeImageValuesButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Normalizes the diffusion-weighted image values across all weighted volumes to the given mean and standard deviation.</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Normalize image values</string>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="QFrame" name="frame_4">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_4">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
               <number>0</number>
              </property>
              <item row="0" column="0">
               <widget class="QSpinBox" name="m_targetBValueSpinBox">
                <property name="enabled">
                 <bool>false</bool>
                </property>
                <property name="toolTip">
                 <string>Target b-value</string>
                </property>
                <property name="maximum">
                 <number>100000</number>
                </property>
                <property name="singleStep">
                 <number>500</number>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QComboBox" name="m_ProjectionMethodBox">
                <property name="toolTip">
                 <string>Select projection method.</string>
                </property>
                <property name="sizeAdjustPolicy">
                 <enum>QComboBox::AdjustToMinimumContentsLength</enum>
                </property>
                <item>
                 <property name="text">
                  <string>ADC Average</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>AKC</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Bi-Exponential</string>
                 </property>
                </item>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QCommandLinkButton" name="m_ButtonAverageGradients">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Multiple acquistions of one gradient direction can be averaged. Due to rounding errors, similar gradients often differ in the last decimal positions. The Merge radius allows to average them by taking all directions within a certain radius into account.</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Average repetitions</string>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QCommandLinkButton" name="m_ProjectSignalButton">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Project image values onto one b-shell.</string>
             </property>
             <property name="text">
              <string>Project onto shell</string>
             </property>
            </widget>
           </item>
           <item row="3" column="1">
            <widget class="QFrame" name="frame_6">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_19">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="verticalSpacing">
               <number>0</number>
              </property>
              <item row="0" column="1">
               <widget class="QSpinBox" name="m_NewStdev">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="toolTip">
                 <string>New stdev</string>
                </property>
                <property name="maximum">
                 <number>100000</number>
                </property>
                <property name="singleStep">
                 <number>100</number>
                </property>
                <property name="value">
                 <number>500</number>
                </property>
               </widget>
              </item>
              <item row="0" column="2">
               <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_NormalizationMaskBox">
                <property name="toolTip">
                 <string>Select binary mask image. The mask is used to calculate the old mean and standard deviation. </string>
                </property>
                <property name="sizeAdjustPolicy">
                 <enum>QComboBox::AdjustToMinimumContentsLength</enum>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
               <widget class="QSpinBox" name="m_NewMean">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="toolTip">
                 <string>New mean value</string>
                </property>
                <property name="maximum">
                 <number>100000</number>
                </property>
                <property name="singleStep">
                 <number>100</number>
                </property>
                <property name="value">
                 <number>1000</number>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="4" column="0">
            <widget class="QCommandLinkButton" name="m_FlipAxis">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Merges selected DWIs of same dimension. If several b-values are present, the resulting image will contain multiple b-shells.</string>
             </property>
             <property name="statusTip">
              <string/>
             </property>
             <property name="whatsThis">
              <string notr="true"/>
             </property>
             <property name="text">
              <string>Flip axis</string>
             </property>
            </widget>
           </item>
           <item row="4" column="1">
            <widget class="QFrame" name="frame_7">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_20">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item row="0" column="2">
               <widget class="QCheckBox" name="m_FlipY">
                <property name="text">
                 <string>Y</string>
                </property>
               </widget>
              </item>
              <item row="0" column="4">
               <spacer name="horizontalSpacer_4">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>40</width>
                  <height>20</height>
                 </size>
                </property>
               </spacer>
              </item>
              <item row="0" column="1">
               <widget class="QCheckBox" name="m_FlipX">
                <property name="text">
                 <string>X</string>
                </property>
               </widget>
              </item>
              <item row="0" column="3">
               <widget class="QCheckBox" name="m_FlipZ">
                <property name="text">
                 <string>Z</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
               <widget class="QLabel" name="label_8">
                <property name="text">
                 <string>Axis:</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="6" column="1">
            <widget class="QmitkDataStorageComboBox" name="m_MergeDwiBox">
             <property name="sizeAdjustPolicy">
              <enum>QComboBox::AdjustToMinimumContentsLength</enum>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>Resample image</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_12">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <property name="spacing">
            <number>6</number>
           </property>
           <item row="1" column="0">
            <widget class="QFrame" name="m_ResampleDoubleFrame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_5">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
               <number>0</number>
              </property>
              <item row="0" column="1">
               <widget class="QDoubleSpinBox" name="m_ResampleDoubleY">
                <property name="minimum">
                 <double>0.010000000000000</double>
                </property>
                <property name="value">
                 <double>2.000000000000000</double>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
               <widget class="QDoubleSpinBox" name="m_ResampleDoubleX">
                <property name="minimum">
                 <double>0.010000000000000</double>
                </property>
                <property name="value">
                 <double>2.000000000000000</double>
                </property>
               </widget>
              </item>
              <item row="0" column="2">
               <widget class="QDoubleSpinBox" name="m_ResampleDoubleZ">
                <property name="minimum">
                 <double>0.010000000000000</double>
                </property>
                <property name="value">
                 <double>2.000000000000000</double>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QComboBox" name="m_ResampleTypeBox">
             <item>
              <property name="text">
               <string>Sampling factor</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>New image spacing</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>New image size</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QFrame" name="frame_5">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_14">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
               <number>0</number>
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="label_3">
                <property name="text">
                 <string>Interpolator:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QComboBox" name="m_InterpolatorBox">
                <item>
                 <property name="text">
                  <string>Nearest neighbour</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Linear</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>B-spline</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Windowed sinc</string>
                 </property>
                </item>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QCommandLinkButton" name="m_ResampleImageButton">
                <property name="enabled">
                 <bool>false</bool>
                </property>
                <property name="toolTip">
                 <string/>
                </property>
                <property name="statusTip">
                 <string/>
                </property>
                <property name="whatsThis">
                 <string notr="true"/>
                </property>
                <property name="text">
                 <string>Resample image</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QFrame" name="m_ResampleIntFrame">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout" name="gridLayout_13">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
               <number>0</number>
              </property>
              <item row="0" column="0">
               <widget class="QSpinBox" name="m_ResampleIntX">
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>10000</number>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QSpinBox" name="m_ResampleIntY">
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>10000</number>
                </property>
               </widget>
              </item>
              <item row="0" column="2">
               <widget class="QSpinBox" name="m_ResampleIntZ">
                <property name="minimum">
                 <number>1</number>
                </property>
                <property name="maximum">
                 <number>10000</number>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox_8">
          <property name="title">
           <string>Crop Image</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_22">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <property name="spacing">
            <number>6</number>
           </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_9">
             <property name="text">
              <string>x:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="m_XstartBox"/>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_10">
             <property name="text">
              <string>y:</string>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
              <string>z:</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QCommandLinkButton" name="m_CropImageButton">
             <property name="text">
              <string>Crop Image</string>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QSpinBox" name="m_XendBox"/>
           </item>
           <item row="1" column="1">
            <widget class="QSpinBox" name="m_YstartBox"/>
           </item>
           <item row="1" column="2">
            <widget class="QSpinBox" name="m_YendBox"/>
           </item>
           <item row="2" column="1">
            <widget class="QSpinBox" name="m_ZstartBox"/>
           </item>
           <item row="2" column="2">
            <widget class="QSpinBox" name="m_ZendBox"/>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
        <string>Header</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
           <string>Voxel size</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_16">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="2">
            <widget class="QDoubleSpinBox" name="m_HeaderSpacingZ">
             <property name="decimals">
              <number>4</number>
             </property>
             <property name="minimum">
              <double>0.000000000000000</double>
             </property>
             <property name="maximum">
              <double>99.989999999999995</double>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QDoubleSpinBox" name="m_HeaderSpacingX">
             <property name="decimals">
              <number>4</number>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QDoubleSpinBox" name="m_HeaderSpacingY">
             <property name="decimals">
              <number>4</number>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QCommandLinkButton" name="m_ModifyHeader">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="toolTip">
           <string/>
          </property>
          <property name="statusTip">
           <string/>
          </property>
          <property name="whatsThis">
           <string notr="true"/>
          </property>
          <property name="text">
           <string>Apply new header information</string>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Direction matrix</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="0">
            <widget class="QTableWidget" name="m_DirectionMatrixTable">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>0</width>
               <height>0</height>
              </size>
             </property>
             <property name="cursor" stdset="0">
              <cursorShape>IBeamCursor</cursorShape>
             </property>
             <property name="autoFillBackground">
              <bool>true</bool>
             </property>
             <property name="verticalScrollBarPolicy">
              <enum>Qt::ScrollBarAlwaysOff</enum>
             </property>
             <property name="horizontalScrollBarPolicy">
              <enum>Qt::ScrollBarAlwaysOff</enum>
             </property>
             <property name="showGrid">
              <bool>true</bool>
             </property>
             <property name="cornerButtonEnabled">
              <bool>false</bool>
             </property>
             <attribute name="horizontalHeaderVisible">
              <bool>false</bool>
             </attribute>
             <attribute name="horizontalHeaderCascadingSectionResizes">
              <bool>true</bool>
             </attribute>
             <attribute name="horizontalHeaderHighlightSections">
              <bool>true</bool>
             </attribute>
             <attribute name="horizontalHeaderMinimumSectionSize">
              <number>0</number>
             </attribute>
             <attribute name="verticalHeaderVisible">
              <bool>false</bool>
             </attribute>
             <attribute name="verticalHeaderCascadingSectionResizes">
              <bool>true</bool>
             </attribute>
             <attribute name="verticalHeaderHighlightSections">
              <bool>true</bool>
             </attribute>
             <row>
              <property name="text">
               <string>New Row</string>
              </property>
             </row>
             <row>
              <property name="text">
               <string>New Row</string>
              </property>
             </row>
             <row>
              <property name="text">
               <string>New Row</string>
              </property>
             </row>
             <column>
              <property name="text">
               <string>New Column</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string>New Column</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string>New Column</string>
              </property>
             </column>
            </widget>
           </item>
           <item row="0" column="1">
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QGroupBox" name="groupBox_4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Measurment frame</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="0">
            <widget class="QTableWidget" name="m_MeasurementFrameTable">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>0</width>
               <height>0</height>
              </size>
             </property>
             <property name="cursor" stdset="0">
              <cursorShape>IBeamCursor</cursorShape>
             </property>
             <property name="autoFillBackground">
              <bool>true</bool>
             </property>
             <property name="verticalScrollBarPolicy">
              <enum>Qt::ScrollBarAlwaysOff</enum>
             </property>
             <property name="horizontalScrollBarPolicy">
              <enum>Qt::ScrollBarAlwaysOff</enum>
             </property>
             <property name="showGrid">
              <bool>true</bool>
             </property>
             <property name="cornerButtonEnabled">
              <bool>false</bool>
             </property>
             <attribute name="horizontalHeaderVisible">
              <bool>false</bool>
             </attribute>
             <attribute name="horizontalHeaderCascadingSectionResizes">
              <bool>true</bool>
             </attribute>
             <attribute name="horizontalHeaderHighlightSections">
              <bool>true</bool>
             </attribute>
             <attribute name="horizontalHeaderMinimumSectionSize">
              <number>0</number>
             </attribute>
             <attribute name="verticalHeaderVisible">
              <bool>false</bool>
             </attribute>
             <attribute name="verticalHeaderCascadingSectionResizes">
              <bool>true</bool>
             </attribute>
             <attribute name="verticalHeaderHighlightSections">
              <bool>true</bool>
             </attribute>
             <row>
              <property name="text">
               <string>New Row</string>
              </property>
             </row>
             <row>
              <property name="text">
               <string>New Row</string>
              </property>
             </row>
             <row>
              <property name="text">
               <string>New Row</string>
              </property>
             </row>
             <column>
              <property name="text">
               <string>New Column</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string>New Column</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string>New Column</string>
              </property>
             </column>
            </widget>
           </item>
           <item row="0" column="1">
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item row="7" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="1" column="0">
         <widget class="QGroupBox" name="groupBox_5">
          <property name="title">
           <string>Origin</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_17">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="2">
            <widget class="QDoubleSpinBox" name="m_HeaderOriginZ">
             <property name="decimals">
              <number>4</number>
             </property>
             <property name="minimum">
              <double>-999999999.000000000000000</double>
             </property>
             <property name="maximum">
              <double>999999999.000000000000000</double>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QDoubleSpinBox" name="m_HeaderOriginY">
             <property name="decimals">
              <number>4</number>
             </property>
             <property name="minimum">
              <double>-99999999.000000000000000</double>
             </property>
             <property name="maximum">
              <double>999999999.000000000000000</double>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QDoubleSpinBox" name="m_HeaderOriginX">
             <property name="decimals">
              <number>4</number>
             </property>
             <property name="minimum">
              <double>-999999999.000000000000000</double>
             </property>
             <property name="maximum">
              <double>999999999.000000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="8" column="0">
         <widget class="QGroupBox" name="groupBox_7">
          <property name="title">
           <string>Align origins</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_15">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="1">
            <widget class="QmitkDataStorageComboBox" name="m_AlignImageBox">
             <property name="sizeAdjustPolicy">
              <enum>QComboBox::AdjustToMinimumContentsLength</enum>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QCommandLinkButton" name="m_AlignImageButton">
             <property name="text">
              <string>Align to</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Other</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_9">
        <item row="1" column="0">
         <widget class="QCommandLinkButton" name="m_ExtractBrainMask">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="toolTip">
           <string>If multiple baseline acquisitions are present, the default behaviour is to output an averaged image.</string>
          </property>
          <property name="statusTip">
           <string/>
          </property>
          <property name="whatsThis">
           <string notr="true"/>
          </property>
          <property name="text">
           <string>Estimate binary brain mask</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QSpinBox" name="m_BrainMaskIterationsBox">
          <property name="toolTip">
           <string>Maximum number of iterations.</string>
          </property>
          <property name="maximum">
           <number>10000</number>
          </property>
          <property name="value">
           <number>10000</number>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="0">
         <widget class="QCommandLinkButton" name="m_ButtonExtractB0">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="toolTip">
           <string>If multiple baseline acquisitions are present, the default behaviour is to output an averaged image.</string>
          </property>
          <property name="statusTip">
           <string/>
          </property>
          <property name="whatsThis">
           <string notr="true"/>
          </property>
          <property name="text">
           <string>Extract baseline image</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QCheckBox" name="m_CheckExtractAll">
          <property name="toolTip">
           <string>Create a 3D+t data set containing all b0 images as timesteps</string>
          </property>
          <property name="text">
           <string>Disable averaging</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkDataStorageComboBoxWithSelectNone</class>
    <extends>QComboBox</extends>
    <header>QmitkDataStorageComboBoxWithSelectNone.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_SelctedImageComboBox</tabstop>
   <tabstop>tabWidget</tabstop>
   <tabstop>m_B_ValueMap_TableWidget</tabstop>
   <tabstop>m_CreateLengthCorrectedDwi</tabstop>
   <tabstop>m_B_ValueMap_Rounder_SpinBox</tabstop>
   <tabstop>m_FlipGradientsButton</tabstop>
   <tabstop>m_FlipGradBoxX</tabstop>
   <tabstop>m_FlipGradBoxY</tabstop>
   <tabstop>m_FlipGradBoxZ</tabstop>
   <tabstop>m_ShowGradientsButton</tabstop>
   <tabstop>m_MirrorGradientToHalfSphereButton</tabstop>
   <tabstop>m_ReduceGradientsButton</tabstop>
   <tabstop>m_ClearRotationButton</tabstop>
   <tabstop>m_RemoveGradientButton</tabstop>
   <tabstop>m_RemoveGradientBox</tabstop>
   <tabstop>m_ExtractGradientButton</tabstop>
   <tabstop>m_ExtractGradientBox</tabstop>
   <tabstop>m_ButtonAverageGradients</tabstop>
   <tabstop>m_Blur</tabstop>
   <tabstop>m_ProjectSignalButton</tabstop>
   <tabstop>m_targetBValueSpinBox</tabstop>
   <tabstop>m_ProjectionMethodBox</tabstop>
   <tabstop>m_NormalizeImageValuesButton</tabstop>
   <tabstop>m_NewMean</tabstop>
   <tabstop>m_NewStdev</tabstop>
   <tabstop>m_NormalizationMaskBox</tabstop>
   <tabstop>m_FlipAxis</tabstop>
   <tabstop>m_FlipX</tabstop>
   <tabstop>m_FlipY</tabstop>
   <tabstop>m_FlipZ</tabstop>
   <tabstop>m_MergeDwisButton</tabstop>
   <tabstop>m_MergeDwiBox</tabstop>
   <tabstop>m_ResampleTypeBox</tabstop>
   <tabstop>m_ResampleDoubleX</tabstop>
   <tabstop>m_ResampleDoubleY</tabstop>
   <tabstop>m_ResampleDoubleZ</tabstop>
   <tabstop>m_ResampleIntX</tabstop>
   <tabstop>m_ResampleIntY</tabstop>
   <tabstop>m_ResampleIntZ</tabstop>
   <tabstop>m_InterpolatorBox</tabstop>
   <tabstop>m_ResampleImageButton</tabstop>
   <tabstop>m_XstartBox</tabstop>
   <tabstop>m_XendBox</tabstop>
   <tabstop>m_YstartBox</tabstop>
   <tabstop>m_YendBox</tabstop>
   <tabstop>m_ZstartBox</tabstop>
   <tabstop>m_ZendBox</tabstop>
   <tabstop>m_CropImageButton</tabstop>
   <tabstop>m_ModifyHeader</tabstop>
   <tabstop>m_HeaderOriginX</tabstop>
   <tabstop>m_HeaderOriginY</tabstop>
   <tabstop>m_HeaderOriginZ</tabstop>
   <tabstop>m_HeaderSpacingX</tabstop>
   <tabstop>m_HeaderSpacingY</tabstop>
   <tabstop>m_HeaderSpacingZ</tabstop>
   <tabstop>m_DirectionMatrixTable</tabstop>
   <tabstop>m_MeasurementFrameTable</tabstop>
   <tabstop>m_ButtonExtractB0</tabstop>
   <tabstop>m_CheckExtractAll</tabstop>
   <tabstop>m_ExtractBrainMask</tabstop>
   <tabstop>m_BrainMaskIterationsBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/mitkPluginActivator.cpp
index baf96673ff..56d175c7d5 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/mitkPluginActivator.cpp
@@ -1,42 +1,44 @@
 /*===================================================================
 
 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 "mitkPluginActivator.h"
 
 #include "src/internal/QmitkPreprocessingView.h"
+#include "src/internal/QmitkDwiPreprocessingPerspective.h"
 #include <usModuleInitialization.h>
 
 
 ctkPluginContext* mitk::PluginActivator::m_Context = nullptr;
 
 US_INITIALIZE_MODULE
 
 ctkPluginContext* mitk::PluginActivator::GetContext()
 {
   return m_Context;
 }
 
 void mitk::PluginActivator::start(ctkPluginContext* context)
 {
+  BERRY_REGISTER_EXTENSION_CLASS(QmitkDwiPreprocessingPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkPreprocessingView, context)
   m_Context = context;
 }
 
 void mitk::PluginActivator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
   m_Context = nullptr;
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.python/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging.python/files.cmake
index 03078b8ef2..af3084b117 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.python/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.python/files.cmake
@@ -1,42 +1,41 @@
 set(SRC_CPP_FILES
 
 
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
-  
+
   QmitkBrainExtractionView.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkBrainExtractionViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
 
   src/internal/QmitkBrainExtractionView.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
-  
-  resources/preprocessing.png
+
   resources/dwi2.png
 )
 
 set(QRC_FILES
 
 )
 
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.python/resources/preprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimaging.python/resources/preprocessing.png
deleted file mode 100644
index d7564ca333..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.python/resources/preprocessing.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.python/resources/preprocessing.xcf b/Plugins/org.mitk.gui.qt.diffusionimaging.python/resources/preprocessing.xcf
deleted file mode 100644
index c7b840caf9..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.python/resources/preprocessing.xcf and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/documentation/UserManual/QmitkDiffusionImagingQuantificationPage.dox b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/documentation/UserManual/QmitkDiffusionImagingQuantificationPage.dox
index 1344800441..831dc92e9d 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/documentation/UserManual/QmitkDiffusionImagingQuantificationPage.dox
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/documentation/UserManual/QmitkDiffusionImagingQuantificationPage.dox
@@ -1,8 +1,7 @@
 /**
 
 \page org_mitk_views_diffusionquantification Scalar Indices
 
-The scalar indices view allows the derivation of different scalar anisotropy measures for the reconstructed tensors (Fractional Anisotropy, Relative Anisotropy, Axial Diffusivity, Radial Diffusivity) or ODFs (Generalized Fractional Anisotropy).
+The scalar indices view allows the calculation of different scalar measures for raw diffusion-weighted images (MD, ADC), tensors (Fractional Anisotropy, Relative Anisotropy, Axial Diffusivity, Radial Diffusivity) or ODFs (Generalized Fractional Anisotropy).
 
-\imageMacro{ScalarIndicesGUI.png,"Anisotropy quantification",2}
 */
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/files.cmake
index cfe817b504..a871219250 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/files.cmake
@@ -1,66 +1,66 @@
 set(SRC_CPP_FILES
   QmitkODFDetailsWidget.cpp
   QmitkODFRenderWidget.cpp
   QmitkResidualAnalysisWidget.cpp
   QmitkResidualViewWidget.cpp
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
 
   Perspectives/QmitkReconstructionPerspective.cpp
+  Perspectives/QmitkQuantificationPerspective.cpp
 
   QmitkQBallReconstructionView.cpp
   QmitkDiffusionQuantificationView.cpp
   QmitkTensorReconstructionView.cpp
   QmitkODFDetailsView.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkQBallReconstructionViewControls.ui
   src/internal/QmitkDiffusionQuantificationViewControls.ui
   src/internal/QmitkTensorReconstructionViewControls.ui
   src/internal/QmitkODFDetailsViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
 
   src/internal/Perspectives/QmitkReconstructionPerspective.h
+  src/internal/Perspectives/QmitkQuantificationPerspective.h
 
   src/internal/QmitkQBallReconstructionView.h
   src/internal/QmitkDiffusionQuantificationView.h
   src/internal/QmitkTensorReconstructionView.h
   src/internal/QmitkODFDetailsView.h
 
   src/QmitkODFRenderWidget.h
   src/QmitkODFDetailsWidget.h
   src/QmitkResidualAnalysisWidget.h
   src/QmitkResidualViewWidget.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 
   resources/quantification.png
   resources/OdfDetails.png
-  resources/reconodf.png
-  resources/recontensor.png
   resources/tensor.png
   resources/odf.png
 )
 
 set(QRC_FILES
 
 )
 
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/plugin.xml
index fa2dff4b2b..4fae3638b9 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/plugin.xml
@@ -1,105 +1,112 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
 
     <view id="org.mitk.views.qballreconstruction"
     name="Q-Balls"
     category="Signal modeling"
     icon="resources/odf.png"
     class="QmitkQBallReconstructionView">
     <description>Q-Ball reconstruction view</description>
-    <keywordReference id="org.mitk.views.qballreconstruction.Keyword"/>
+    <keywordReference id="org.mitk.views.reconstruction.Keyword"/>
     </view>
 
     <view id="org.mitk.views.diffusionquantification"
     name="Diffusion Indices"
     category="Quantification"
     class="QmitkDiffusionQuantificationView"
     icon="resources/quantification.png">
     <description>Calculation of tensor, ODF and raw signal scalar maps.</description>
     <keywordReference id="org.mitk.views.diffusionquantification.Keyword"/>
     </view>
 
     <view id="org.mitk.views.tensorreconstruction"
     name="Tensors"
     category="Signal modeling"
     icon="resources/tensor.png"
     class="QmitkTensorReconstructionView">
-    <keywordReference id="org.mitk.views.tensorreconstruction.Keyword"/>
+    <keywordReference id="org.mitk.views.reconstruction.Keyword"/>
     </view>
 
     <view id="org.mitk.views.odfdetails"
     name="ODF Details"
     category="Quantification"
     class="QmitkODFDetailsView"
     icon="resources/OdfDetails.png">
     <keywordReference id="org.mitk.views.odfdetails.Keyword"/>
     </view>
 
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
 
-  <keyword label="signal" id="org.mitk.views.qballreconstruction.Keyword"/>
-  <keyword label="reconstruction" id="org.mitk.views.qballreconstruction.Keyword"/>
-  <keyword label="ball" id="org.mitk.views.qballreconstruction.Keyword"/>
-  <keyword label="diffusion" id="org.mitk.views.qballreconstruction.Keyword"/>
-  <keyword label="qball" id="org.mitk.views.qballreconstruction.Keyword"/>
-  <keyword label="q-ball" id="org.mitk.views.qballreconstruction.Keyword"/>
-  <keyword label="propagator" id="org.mitk.views.qballreconstruction.Keyword"/>
-  <keyword label="modeling" id="org.mitk.views.qballreconstruction.Keyword"/>
+  <keyword label="signal" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="reconstruction" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="ball" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="diffusion" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="qball" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="q-ball" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="propagator" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="modeling" id="org.mitk.views.reconstruction.Keyword"/>
   <keyword label="ODF" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="dODF" id="org.mitk.views.diffusionquantification.Keyword"/>
 
-  <keyword label="signal" id="org.mitk.views.tensorreconstruction.Keyword"/>
-  <keyword label="reconstruction" id="org.mitk.views.tensorreconstruction.Keyword"/>
-  <keyword label="tensor" id="org.mitk.views.tensorreconstruction.Keyword"/>
-  <keyword label="diffusion" id="org.mitk.views.tensorreconstruction.Keyword"/>
-  <keyword label="second order" id="org.mitk.views.tensorreconstruction.Keyword"/>
-  <keyword label="propagator" id="org.mitk.views.tensorreconstruction.Keyword"/>
-  <keyword label="modeling" id="org.mitk.views.tensorreconstruction.Keyword"/>
-  <keyword label="DTI" id="org.mitk.views.tensorreconstruction.Keyword"/>
+  <keyword label="signal" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="reconstruction" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="tensor" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="diffusion" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="second order" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="propagator" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="modeling" id="org.mitk.views.reconstruction.Keyword"/>
+  <keyword label="DTI" id="org.mitk.views.reconstruction.Keyword"/>
 
   <keyword label="ADC" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="GFA" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="RA" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="AD" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="RD" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="MD" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="anisotropy" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="fractional" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="radial" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="axial" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="diffusivity" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="mean" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="generalized" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="derived" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="index" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="indices" id="org.mitk.views.diffusionquantification.Keyword"/>
   <keyword label="diffusion" id="org.mitk.views.diffusionquantification.Keyword"/>
 
   <keyword label="ODF" id="org.mitk.views.odfdetails.Keyword"/>
   <keyword label="dODF" id="org.mitk.views.odfdetails.Keyword"/>
   <keyword label="fODF" id="org.mitk.views.odfdetails.Keyword"/>
   <keyword label="FOD" id="org.mitk.views.odfdetails.Keyword"/>
   <keyword label="statistics" id="org.mitk.views.odfdetails.Keyword"/>
   <keyword label="values" id="org.mitk.views.odfdetails.Keyword"/>
   <keyword label="shape" id="org.mitk.views.odfdetails.Keyword"/>
 
   </extension>
 
 
   <extension point="org.blueberry.ui.perspectives">
 
-    <perspective id="org.mitk.perspectives.reconstruction1"
-    name="ODF Reconstruction/Signal Modelling"
-    class="QmitkReconstructionPerspective"
-    icon="resources/odf.png">
-    <keywordReference id="org.mitk.perspectives.reconstruction1.Keyword"/>
-    </perspective>
+  <perspective id="org.mitk.perspectives.reconstruction1"
+  name="ODF Reconstruction/Signal Modelling"
+  class="QmitkReconstructionPerspective"
+  icon="resources/odf.png">
+  <keywordReference id="org.mitk.views.reconstruction.Keyword"/>
+  </perspective>
+
+  <perspective id="org.mitk.perspectives.quantification"
+  name="Diffusion Indices"
+  class="QmitkQuantificationPerspective"
+  icon="resources/quantification.png">
+  <keywordReference id="org.mitk.views.diffusionquantification.Keyword"/>
+  </perspective>
 
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/QmitkDiffusionImaging.qrc b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/QmitkDiffusionImaging.qrc
index 74d6895d11..cb3bc7bf16 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/QmitkDiffusionImaging.qrc
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/QmitkDiffusionImaging.qrc
@@ -1,9 +1,7 @@
 <RCC>
     <qresource prefix="/QmitkDiffusionImaging">
         <file>tensor.png</file>
         <file>quantification.png</file>
-        <file>reconodf.png</file>
-        <file>recontensor.png</file>
         <file>odf.png</file>
     </qresource>
 </RCC>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/odf.png b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/odf.png
index a89e20560d..d99423e16e 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/odf.png and b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/odf.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/reconodf.png b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/reconodf.png
deleted file mode 100644
index 720eadbdc7..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/reconodf.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/recontensor.png b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/recontensor.png
deleted file mode 100644
index 547ea07857..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/recontensor.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/tensor.png b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/tensor.png
index 755d592fc7..22c5433a60 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/tensor.png and b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/resources/tensor.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkQuantificationPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkQuantificationPerspective.cpp
new file mode 100644
index 0000000000..8310b75382
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkQuantificationPerspective.cpp
@@ -0,0 +1,50 @@
+/*===================================================================
+
+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 "QmitkQuantificationPerspective.h"
+#include "berryIViewLayout.h"
+
+void QmitkQuantificationPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
+{
+  /////////////////////////////////////////////////////
+  // all di-app perspectives should have the following:
+  /////////////////////////////////////////////////////
+
+  QString editorArea = layout->GetEditorArea();
+
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
+
+  layout->AddStandaloneView("org.mitk.views.datamanager",
+                            false, berry::IPageLayout::LEFT, 0.3f, editorArea);
+
+  layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
+                            false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
+
+  berry::IFolderLayout::Pointer left =
+      layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
+                           berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
+
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
+                                       berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
+
+  /////////////////////////////////////////////
+  // here goes the perspective specific stuff
+  /////////////////////////////////////////////
+
+  left->AddView("org.mitk.views.diffusionquantification");
+  left->AddView("org.mitk.views.imagestatistics");
+  left->AddView("org.mitk.views.segmentation");
+}
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkQuantificationPerspective.h
similarity index 64%
rename from Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.h
rename to Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkQuantificationPerspective.h
index 1fda4f7c7b..8ea0b75a8a 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.h
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkQuantificationPerspective.h
@@ -1,36 +1,36 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
-#ifndef QmitkMachineLearningTractographyPerspective_H_
-#define QmitkMachineLearningTractographyPerspective_H_
+#ifndef QmitkQuantificationPerspective_H_
+#define QmitkQuantificationPerspective_H_
 
 #include <berryIPerspectiveFactory.h>
 
-class QmitkMachineLearningTractographyPerspective : public QObject, public berry::IPerspectiveFactory
+class QmitkQuantificationPerspective : public QObject, public berry::IPerspectiveFactory
 {
   Q_OBJECT
   Q_INTERFACES(berry::IPerspectiveFactory)
 
 public:
 
-  QmitkMachineLearningTractographyPerspective() {}
-  ~QmitkMachineLearningTractographyPerspective() {}
+  QmitkQuantificationPerspective() {}
+  ~QmitkQuantificationPerspective() {}
 
   void CreateInitialLayout(berry::IPageLayout::Pointer layout) override;
 };
 
-#endif /* QmitkMachineLearningTractographyPerspective_H_ */
+#endif /* QmitkQuantificationPerspective_H_ */
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkReconstructionPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkReconstructionPerspective.cpp
index 5d41035ce5..c32959dc7a 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkReconstructionPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkReconstructionPerspective.cpp
@@ -1,52 +1,50 @@
 /*===================================================================
 
 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 "QmitkReconstructionPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkReconstructionPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
-    /////////////////////////////////////////////////////
-    // all di-app perspectives should have the following:
-    /////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////
+  // all di-app perspectives should have the following:
+  /////////////////////////////////////////////////////
 
-    QString editorArea = layout->GetEditorArea();
+  QString editorArea = layout->GetEditorArea();
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
-    layout->AddStandaloneView("org.mitk.views.datamanager",
-                              false, berry::IPageLayout::LEFT, 0.3f, editorArea);
+  layout->AddStandaloneView("org.mitk.views.datamanager",
+                            false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
-    layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
-                              false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
+  layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
+                            false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
-    berry::IFolderLayout::Pointer left =
-            layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
-                                 berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
+  berry::IFolderLayout::Pointer left =
+      layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
+                           berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
-                                         berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
+                                       berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
-    /////////////////////////////////////////////
-    // here goes the perspective specific stuff
-    /////////////////////////////////////////////
+  /////////////////////////////////////////////
+  // here goes the perspective specific stuff
+  /////////////////////////////////////////////
 
-    left->AddView("org.mitk.views.tensorreconstruction");
-    left->AddView("org.mitk.views.qballreconstruction");
-    left->AddView("org.mitk.views.diffusionquantification");
-    left->AddView("org.mitk.views.diffusionpreprocessing");
-    left->AddView("org.mitk.views.odfdetails");
+  left->AddView("org.mitk.views.tensorreconstruction");
+  left->AddView("org.mitk.views.qballreconstruction");
+  left->AddView("org.mitk.views.odfmaximaextraction");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkDiffusionQuantificationViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkDiffusionQuantificationViewControls.ui
index 0201599bbd..ef046f4454 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkDiffusionQuantificationViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkDiffusionQuantificationViewControls.ui
@@ -1,427 +1,421 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkDiffusionQuantificationViewControls</class>
  <widget class="QWidget" name="QmitkDiffusionQuantificationViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>343</width>
     <height>888</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="m_InputData">
      <property name="title">
       <string>Please Select Input Data</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="1">
        <widget class="QLabel" name="m_InputImageLabel">
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;mandatory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Image</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Scale Image Values:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QDoubleSpinBox" name="m_ScaleImageValuesBox">
         <property name="maximum">
          <double>9999999.000000000000000</double>
         </property>
         <property name="value">
          <double>1.000000000000000</double>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Raw diffusion-weighted image</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_5">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QCommandLinkButton" name="m_AdcDwiButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>ADC</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QCommandLinkButton" name="m_MdDwiButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>MD</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QCommandLinkButton" name="m_BallStickButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>Ball-Stick</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="3" column="0">
        <widget class="QCommandLinkButton" name="m_MultiTensorButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>Multi-Tensor Fit</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>ODF image</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_3">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QFrame" name="frame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
           <widget class="QCheckBox" name="m_StandardGFACheckbox">
            <property name="text">
             <string>Generalized GFA</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QFrame" name="frame_2">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <property name="leftMargin">
              <number>0</number>
             </property>
             <property name="topMargin">
              <number>0</number>
             </property>
             <property name="rightMargin">
              <number>0</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
             </property>
             <item>
              <widget class="QLabel" name="m_ParamK">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="text">
                <string>k</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLineEdit" name="m_ParamKEdit">
               <property name="enabled">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLabel" name="m_ParamP">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="text">
                <string>p</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLineEdit" name="m_ParamPEdit">
               <property name="enabled">
                <bool>true</bool>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QCommandLinkButton" name="m_GFAButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>GFA</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QFrame" name="frame_3">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Min. angle</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="MinAngle"/>
          </item>
          <item>
           <widget class="QLabel" name="label_3">
            <property name="text">
             <string>Max. angle</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="MaxAngle"/>
          </item>
         </layout>
        </widget>
       </item>
-      <item>
+      <item row="3" column="0">
        <widget class="QCommandLinkButton" name="m_CurvatureButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>Curvature</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Tensor image</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_4">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QCommandLinkButton" name="m_FAButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>FA (Fractional Anisotropy)</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QCommandLinkButton" name="m_RAButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>RA (Relative Anisotropy)</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QCommandLinkButton" name="m_ADButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>AD (Axial Diffusivity)</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="3" column="0">
        <widget class="QCommandLinkButton" name="m_RDButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>RD (Radial Diffusivity)</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="4" column="0">
        <widget class="QCommandLinkButton" name="m_MDButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>MD (Mean Diffusivity)</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="5" column="0">
        <widget class="QCommandLinkButton" name="m_ClusteringAnisotropy">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>1-(λ2+λ3)/(2*λ1)</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <spacer name="spacer1">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>220</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <includes>
   <include location="local">QmitkDataStorageComboBox.h</include>
  </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.cpp
index 3a33a534ed..96fee83d4c 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.cpp
@@ -1,350 +1,345 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 
 // Qmitk
 #include "QmitkODFDetailsView.h"
 #include <QTableWidgetItem>
 #include <vtkFloatArray.h>
 #include <vtkPointData.h>
 #include <vtkCellData.h>
 #include <vtkLookupTable.h>
 #include <mitkOdfNormalizationMethodProperty.h>
 #include <QTextEdit>
 #include <mitkTensorImage.h>
 #include <QMessageBox>
 #include <QmitkRenderingManager.h>
 
 #include <mitkImageReadAccessor.h>
 
 #include <vtkRenderWindowInteractor.h>
 
 const std::string QmitkODFDetailsView::VIEW_ID = "org.mitk.views.odfdetails";
 
 QmitkODFDetailsView::QmitkODFDetailsView()
   : QmitkAbstractView()
   , m_Controls( 0 )
   , m_OdfNormalization(0)
   , m_ImageNode(nullptr)
 {
   m_VtkActor = vtkActor::New();
   m_VtkMapper = vtkPolyDataMapper::New();
   m_Renderer = vtkRenderer::New();
   m_VtkRenderWindow = vtkRenderWindow::New();
   m_RenderWindowInteractor = vtkRenderWindowInteractor::New();
   m_Camera = vtkCamera::New();
   m_VtkRenderWindow->SetSize(300,300);
 
 }
 
 QmitkODFDetailsView::~QmitkODFDetailsView()
 {
-  if (m_ImageNode.IsNotNull())
-    m_ImageNode->RemoveObserver( m_PropertyObserverTag );
 }
 
 void QmitkODFDetailsView::Activated()
 {
 }
 
 void QmitkODFDetailsView::Deactivated()
 {
 }
 
 void QmitkODFDetailsView::Visible()
 {
 
 }
 
 void QmitkODFDetailsView::Hidden()
 {
 
 }
 
 void QmitkODFDetailsView::SetFocus()
 {
   this->m_Controls->m_OverviewTextEdit->setFocus();
 }
 
 void QmitkODFDetailsView::CreateQtPartControl( QWidget *parent )
 {
   // build up qt view, unless already done
   if ( !m_Controls )
   {
     // create GUI widgets from the Qt Designer's .ui file
     m_Controls = new Ui::QmitkODFDetailsViewControls;
     m_Controls->setupUi( parent );
     m_Controls->m_OdfBox->setVisible(false);
     m_Controls->m_ODFRenderWidget->setVisible(false);
 
 
     m_SliceChangeListener.RenderWindowPartActivated(this->GetRenderWindowPart());
     connect(&m_SliceChangeListener, SIGNAL(SliceChanged()), this, SLOT(OnSliceChanged()));
   }
 }
 
 void QmitkODFDetailsView::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*part*/, const QList<mitk::DataNode::Pointer>& nodes)
 {
-  if (m_ImageNode.IsNotNull())
-    m_ImageNode->RemoveObserver( m_PropertyObserverTag );
-
   m_Controls->m_InputData->setTitle("Please Select Input Data");
   m_Controls->m_InputImageLabel->setText("<font color='red'>mandatory</font>");
 
   m_ImageNode = nullptr;
 
   // iterate selection
   for (mitk::DataNode::Pointer node: nodes)
   {
     if( node.IsNotNull() && (dynamic_cast<mitk::OdfImage*>(node->GetData()) || dynamic_cast<mitk::TensorImage*>(node->GetData())) )
     {
       m_Controls->m_InputImageLabel->setText(node->GetName().c_str());
       m_ImageNode = node;
     }
   }
 
   UpdateOdf();
   if (m_ImageNode.IsNotNull())
   {
     m_Controls->m_InputData->setTitle("Input Data");
   }
 }
 
 void QmitkODFDetailsView::UpdateOdf()
 {
   try
   {
     m_Controls->m_OverviewBox->setVisible(true);
     if (m_ImageNode.IsNull() || !this->GetRenderWindowPart())
     {
       m_Controls->m_ODFRenderWidget->setVisible(false);
       m_Controls->m_OdfBox->setVisible(false);
       m_Controls->m_OverviewBox->setVisible(false);
       return;
     }
 
     // restore the input image label ( needed in case the last run resulted into an exception )
     m_Controls->m_InputImageLabel->setText(m_ImageNode->GetName().c_str());
 
     // ODF Normalization Property
     mitk::OdfNormalizationMethodProperty* nmp = dynamic_cast<mitk::OdfNormalizationMethodProperty*>(m_ImageNode->GetProperty( "Normalization" ));
     if(nmp)
       m_OdfNormalization = nmp->GetNormalization();
 
     m_TemplateOdf = itk::OrientationDistributionFunction<float,ODF_SAMPLING_SIZE>::GetBaseMesh();
     m_OdfTransform = vtkSmartPointer<vtkTransform>::New();
     m_OdfTransform->Identity();
     m_OdfVals = vtkSmartPointer<vtkDoubleArray>::New();
     m_OdfSource = vtkSmartPointer<vtkOdfSource>::New();
     itk::OrientationDistributionFunction<double, ODF_SAMPLING_SIZE> odf;
 
     mitk::Point3D world = this->GetRenderWindowPart()->GetSelectedPosition();
     mitk::Point3D index;
     mitk::Image::Pointer img = dynamic_cast<mitk::Image*>(m_ImageNode->GetData());
     unsigned int *img_dimension = img->GetDimensions();
     img->GetGeometry()->WorldToIndex(world, index);
 
     float sum = 0;
     float max = itk::NumericTraits<float>::NonpositiveMin();
     float min = itk::NumericTraits<float>::max();
     QString values;
     QString overviewText;
 
     // check if dynamic_cast successfull and if the crosshair position is inside of the geometry of the ODF data
     // otherwise possible crash for a scenario with multiple nodes
     if (dynamic_cast<mitk::OdfImage*>(m_ImageNode->GetData()) && ( m_ImageNode->GetData()->GetGeometry()->IsInside(world) ) )
     {
       m_Controls->m_ODFRenderWidget->setVisible(true);
       m_Controls->m_OdfBox->setVisible(true);
 
       try
       {
         const mitk::OdfImage* Odf_image = dynamic_cast< mitk::OdfImage* >( m_ImageNode->GetData() );
 
         // get access to the Odf image data with explicitely allowing exceptions if memory locked
         mitk::ImageReadAccessor readAccess( Odf_image, Odf_image->GetVolumeData(0), mitk::ImageAccessorBase::ExceptionIfLocked );
         const float* Odf_cPtr = static_cast< const float*>(readAccess.GetData());
 
         OdfVectorImgType::IndexType ind;
         ind[0] = (int)(index[0]+0.5);
         ind[1] = (int)(index[1]+0.5);
         ind[2] = (int)(index[2]+0.5);
 
         // pixel size = ODF_SAMPLING_SIZE
         // position offset = standard offset
         unsigned int offset_to_data = ODF_SAMPLING_SIZE * (ind[2] * img_dimension[1] * img_dimension[0] + ind[1] * img_dimension[0] + ind[0]);
         const float *pixel_data = Odf_cPtr + offset_to_data;
 
         for (int i=0; i<ODF_SAMPLING_SIZE; i++)
         {
           float val = pixel_data[i];
           odf.SetNthComponent(i, val);
           values += QString::number(i)+": "+QString::number(val)+"\n";
           sum += val;
           if (val>max)
             max = val;
           if (val<min)
             min = val;
         }
         float mean = sum/ODF_SAMPLING_SIZE;
 
         float stdev = 0;
         for (int i=0; i<ODF_SAMPLING_SIZE; i++)
         {
           float val = pixel_data[i];
           float diff = val - mean;
           stdev += diff*diff;
         }
         stdev = std::sqrt(stdev/(ODF_SAMPLING_SIZE-1));
 
         QString pos = QString::number(ind[0])+", "+QString::number(ind[1])+", "+QString::number(ind[2]);
         overviewText += "Coordinates: "+pos+"\n";
         overviewText += "GFA: "+QString::number(odf.GetGeneralizedFractionalAnisotropy())+"\n";
         overviewText += "Sum: "+QString::number(sum)+"\n";
         overviewText += "Mean: "+QString::number(mean)+"\n";
         overviewText += "Stdev: "+QString::number(stdev)+"\n";
         overviewText += "Min: "+QString::number(min)+"\n";
         overviewText += "Max: "+QString::number(max)+"\n";
         vnl_vector_fixed<double, 3> pd = odf.GetDirection(odf.GetPrincipalDiffusionDirectionIndex());
         overviewText += "Main Diffusion:\n     "+QString::number(pd[0])+"\n     "+QString::number(pd[1])+"\n     "+QString::number(pd[2])+"\n";
 
         m_Controls->m_OdfValuesTextEdit->setText(values);
         m_Controls->m_OverviewTextEdit->setVisible(true);
       }
       catch( mitk::Exception &e )
       {
         MITK_WARN << "LOCKED : " << e.what();
         m_Controls->m_ODFRenderWidget->setVisible(false);
         m_Controls->m_OdfBox->setVisible(false);
         m_Controls->m_OverviewTextEdit->setVisible(false);
 
         // reset the selection
         m_Controls->m_InputImageLabel->setText("<font color='green'>Click image to restore rendering!</font>");
       }
     }
     else if (dynamic_cast<mitk::TensorImage*>(m_ImageNode->GetData()) && ( m_ImageNode->GetData()->GetGeometry()->IsInside(world) ) )
     {
       m_Controls->m_ODFRenderWidget->setVisible(true);
       m_Controls->m_OdfBox->setVisible(false);
 
 
       const mitk::TensorImage* Odf_image = dynamic_cast< mitk::TensorImage*>(m_ImageNode->GetData());
 
       // pixel access block
       try
       {
         // get access to the Odf image data with explicitely allowing exceptions if memory locked
         mitk::ImageReadAccessor readAccess( Odf_image, Odf_image->GetVolumeData(0), mitk::ImageAccessorBase::ExceptionIfLocked );
         const float* Odf_cPtr = static_cast< const float*>(readAccess.GetData());
 
         TensorImageType::IndexType ind;
         ind[0] = (int)(index[0]+0.5);
         ind[1] = (int)(index[1]+0.5);
         ind[2] = (int)(index[2]+0.5);
 
         // 6 - tensorsize
         // remaining computation - standard offset
         unsigned int offset_to_data = 6 * (ind[2] * img_dimension[1] * img_dimension[0] + ind[1] * img_dimension[0] + ind[0]);
         const float *pixel_data = Odf_cPtr + offset_to_data;
 
         float tensorelems[6] = {
           *(pixel_data    ),
           *(pixel_data + 1),
           *(pixel_data + 2),
           *(pixel_data + 3),
           *(pixel_data + 4),
           *(pixel_data + 5),
         };
 
         TensorPixelType tensor(tensorelems);
         odf.InitFromTensor(tensor);
 
         /** Array of eigen-values. */
         typedef itk::FixedArray<float, 3> EigenValuesArrayType;
         /** Matrix of eigen-vectors. */
         typedef itk::Matrix<float, 3, 3> EigenVectorsMatrixType;
 
         EigenValuesArrayType eigenValues;
         EigenVectorsMatrixType eigenvectors;
 
         QString pos = QString::number(ind[0])+", "+QString::number(ind[1])+", "+QString::number(ind[2]);
         overviewText += "Coordinates: "+pos+"\n";
         overviewText += "FA: "+QString::number(tensor.GetFractionalAnisotropy())+"\n";
         overviewText += "RA: "+QString::number(tensor.GetRelativeAnisotropy())+"\n";
         overviewText += "Trace: "+QString::number(tensor.GetTrace())+"\n";
         tensor.ComputeEigenAnalysis(eigenValues,eigenvectors);
         overviewText += "Eigenvalues:\n     "+QString::number(eigenValues[2])+"\n     "+QString::number(eigenValues[1])+"\n     "+QString::number(eigenValues[0])+"\n";
         overviewText += "Main Diffusion:\n     "+QString::number(eigenvectors(2, 0))+"\n     "+QString::number(eigenvectors(2, 1))+"\n     "+QString::number(eigenvectors(2, 2))+"\n";
         overviewText += "Values:\n     "+QString::number(tensorelems[0])+"\n     "+QString::number(tensorelems[1])+"\n     "+QString::number(tensorelems[2])+"\n     "+QString::number(tensorelems[3])+"\n     "+QString::number(tensorelems[4])+"\n     "+QString::number(tensorelems[5])+"\n     "+"\n";
         m_Controls->m_OverviewTextEdit->setVisible(true);
       }
       // end pixel access block
       catch(mitk::Exception &e )
       {
         MITK_WARN << "LOCKED : " << e.what();
         m_Controls->m_ODFRenderWidget->setVisible(false);
         m_Controls->m_OdfBox->setVisible(false);
         m_Controls->m_OverviewTextEdit->setVisible(false);
 
         // reset the selection
         m_Controls->m_InputImageLabel->setText("<font color='green'>Click image to restore rendering!</font>");
       }
     }
     else
     {
       m_Controls->m_ODFRenderWidget->setVisible(false);
       m_Controls->m_OdfBox->setVisible(false);
       overviewText += "Please reinit image geometry.\n";
     }
 
     // proceed only if the render widget is visible which indicates that the
     // predecessing computations were successfull
     if( m_Controls->m_ODFRenderWidget->isVisible() )
     {
       m_Controls->m_ODFDetailsWidget->SetParameters(odf);
 
       switch(m_OdfNormalization)
       {
       case 0:
         odf = odf.MinMaxNormalize();
         break;
       case 1:
         odf = odf.MaxNormalize();
         break;
       case 2:
         odf = odf.MaxNormalize();
         break;
       default:
         odf = odf.MinMaxNormalize();
       }
 
       m_Controls->m_ODFRenderWidget->GenerateODF(odf);
       m_Controls->m_OverviewTextEdit->setText(overviewText.toStdString().c_str());
     }
   }
   catch(...)
   {
     QMessageBox::critical(0, "Error", "Data could not be analyzed. The image might be corrupted.");
   }
 }
 
 void QmitkODFDetailsView::OnSliceChanged()
 {
   UpdateOdf();
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.h b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.h
index f4b5835190..26955931f2 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.h
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkODFDetailsView.h
@@ -1,118 +1,112 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef _QMITKQmitkODFDetailsView_H_INCLUDED
 #define _QMITKQmitkODFDetailsView_H_INCLUDED
 
 #include <berryISelectionListener.h>
 
 #include <QmitkAbstractView.h>
 #include "mitkILifecycleAwarePart.h"
 
 #include "ui_QmitkODFDetailsViewControls.h"
 
 #include <itkVectorImage.h>
 #include <itkImage.h>
 #include <itkOrientationDistributionFunction.h>
 #include <mitkOdfImage.h>
 #include <vtkTransform.h>
 #include <vtkDoubleArray.h>
 #include <vtkOdfSource.h>
 #include <vtkSmartPointer.h>
 #include <QmitkRenderWindow.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkRenderer.h>
 #include <vtkCamera.h>
 #include <itkDiffusionTensor3D.h>
 #include <QmitkSliceNavigationListener.h>
 #include <mitkTensorImage.h>
 
 /*!
   \brief View displaying details of the orientation distribution function in the voxel at the current crosshair position.
 */
 
 class QmitkODFDetailsView : public QmitkAbstractView, public mitk::ILifecycleAwarePart
 {
   // this is needed for all Qt objects that should have a Qt meta-object
   // (everything that derives from QObject and wants to have signal/slots)
   Q_OBJECT
 
 public:
 
   static const std::string VIEW_ID;
 
   QmitkODFDetailsView();
   virtual ~QmitkODFDetailsView();
 
   typedef mitk::OdfImage::ScalarPixelType TOdfPixelType;
   typedef mitk::OdfImage::PixelType       OdfVectorType;
   typedef mitk::OdfImage::ItkOdfImageType OdfVectorImgType;
 
   typedef mitk::TensorImage::PixelType          TensorPixelType;
   typedef mitk::TensorImage::ItkTensorImageType TensorImageType;
 
   virtual void CreateQtPartControl(QWidget *parent) override;
 
 
 protected slots:
 
   void OnSliceChanged();
 
 protected:
 
   /// \brief called by QmitkAbstractView when DataManager's selection has changed
   virtual void OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList<mitk::DataNode::Pointer>& nodes) override;
 
   virtual void SetFocus() override;
 
   virtual void Activated() override;
   virtual void Deactivated() override;
   virtual void Visible() override;
   virtual void Hidden() override;
 
   void UpdateOdf(); ///< called if slice position or datamanager selection has changed
 
   Ui::QmitkODFDetailsViewControls*  m_Controls;
 
-  /** observer flags */
-  int m_SliceObserverTag1;
-  int m_SliceObserverTag2;
-  int m_SliceObserverTag3;
-  int m_PropertyObserverTag;
-
   /** ODF related variables like mesh structure, values etc. */
   vtkPolyData*                      m_TemplateOdf;  ///< spherical base mesh
   vtkSmartPointer<vtkTransform>     m_OdfTransform;
   vtkSmartPointer<vtkDoubleArray>   m_OdfVals;
   vtkSmartPointer<vtkOdfSource>     m_OdfSource;
 
   int                               m_OdfNormalization; ///< normalization method defined in the visualization view
 
   /** rendering of the ODF */
   vtkActor*                     m_VtkActor;
   vtkPolyDataMapper*            m_VtkMapper;
   vtkRenderer*                  m_Renderer;
   vtkRenderWindow*              m_VtkRenderWindow;
   vtkRenderWindowInteractor*    m_RenderWindowInteractor;
   vtkCamera*                    m_Camera;
   mitk::DataNode::Pointer       m_ImageNode;
   QmitkSliceNavigationListener  m_SliceChangeListener;
 };
 
 
 
 #endif // _QmitkODFDetailsView_H_INCLUDED
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkQBallReconstructionViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkQBallReconstructionViewControls.ui
index 22f3bc7697..e3356b76b2 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkQBallReconstructionViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkQBallReconstructionViewControls.ui
@@ -1,343 +1,346 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkQBallReconstructionViewControls</class>
  <widget class="QWidget" name="QmitkQBallReconstructionViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>372</width>
     <height>844</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="acceptDrops">
    <bool>true</bool>
   </property>
   <property name="windowTitle">
    <string>QmitkQBallReconstructionViewControls</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="m_InputData">
      <property name="title">
       <string>Please Select Input Data</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="toolTip">
          <string>Input for Q-Ball reconstruction.</string>
         </property>
         <property name="text">
          <string>Raw DWI:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="m_DiffusionImageLabel">
         <property name="toolTip">
          <string>Input for Q-Ball reconstruction.</string>
         </property>
         <property name="text">
          <string>&lt;font color='red'&gt;mandatory&lt;/font&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Parameters</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QGridLayout" name="gridLayout_5">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QComboBox" name="m_QBallReconstructionMethodComboBox">
         <property name="currentIndex">
          <number>2</number>
         </property>
         <item>
          <property name="text">
           <string>Numerical</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Standard</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Solid Angle</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Constraint Solid Angle</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>ADC-Profile only</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Raw Signal only</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Multi-Shell</string>
          </property>
         </item>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QLabel" name="m_Description">
         <property name="text">
          <string>TextLabel</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QFrame" name="m_ShFrame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item row="0" column="0">
           <widget class="QFrame" name="frame">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" name="gridLayout_2">
             <property name="leftMargin">
              <number>0</number>
             </property>
             <property name="topMargin">
              <number>0</number>
             </property>
             <property name="rightMargin">
              <number>0</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
             </property>
             <item row="4" column="0">
              <widget class="QLabel" name="m_QBallReconstructionLambdaTextLabel_2">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="toolTip">
                <string>Regularization Parameter</string>
               </property>
               <property name="text">
                <string>Lambda:</string>
               </property>
               <property name="wordWrap">
                <bool>false</bool>
               </property>
              </widget>
             </item>
             <item row="4" column="1">
              <widget class="QDoubleSpinBox" name="m_QBallReconstructionLambdaLineEdit">
               <property name="toolTip">
                <string>Regularization factor</string>
               </property>
               <property name="decimals">
                <number>3</number>
               </property>
               <property name="maximum">
                <double>1.000000000000000</double>
               </property>
               <property name="singleStep">
                <double>0.001000000000000</double>
               </property>
               <property name="value">
                <double>0.006000000000000</double>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="m_QBallReconstructionMaxLLevelTextLabel_2">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="text">
                <string>SH-Order:</string>
               </property>
               <property name="wordWrap">
                <bool>false</bool>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="QComboBox" name="m_QBallReconstructionMaxLLevelComboBox">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="currentIndex">
                <number>-1</number>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="m_QBallReconstructionThresholdLabel_2">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="text">
                <string>B0 Threshold</string>
               </property>
               <property name="wordWrap">
                <bool>false</bool>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="QSpinBox" name="m_QBallReconstructionThreasholdEdit">
               <property name="maximum">
                <number>10000</number>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QCheckBox" name="m_OutputCoeffsImage">
            <property name="text">
             <string>Output SH-Coefficient Image</string>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
-      <item>
+      <item row="3" column="0">
        <widget class="QCommandLinkButton" name="m_ButtonStandard">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string notr="true"/>
         </property>
         <property name="text">
          <string>Start Reconstruction</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="m_QBallSelectionBox">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="layoutDirection">
       <enum>Qt::LeftToRight</enum>
      </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
      <property name="title">
       <string>Multi-Shell Reconstruction</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkTensorReconstructionViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkTensorReconstructionViewControls.ui
index 784ebe5fd8..910a5e2d03 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkTensorReconstructionViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/QmitkTensorReconstructionViewControls.ui
@@ -1,644 +1,641 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkTensorReconstructionViewControls</class>
  <widget class="QWidget" name="QmitkTensorReconstructionViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>381</width>
     <height>1019</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="acceptDrops">
    <bool>true</bool>
   </property>
   <property name="windowTitle">
    <string>QmitkTensorReconstructionViewControls</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_11">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_5">
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="m_InputData">
      <property name="title">
       <string>Please Select Input Data:</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="0" column="1">
        <widget class="QLabel" name="m_DiffusionImageLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;mandatory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label_3">
         <property name="toolTip">
          <string/>
         </property>
         <property name="text">
          <string>Raw DWI/DTI:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Tensor Reconstruction</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QGridLayout" name="gridLayout_7">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QCheckBox" name="m_Advanced1">
         <property name="text">
          <string>Advanced Settings</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QFrame" name="frame">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_4">
          <property name="leftMargin">
           <number>9</number>
          </property>
          <property name="topMargin">
           <number>9</number>
          </property>
          <property name="rightMargin">
           <number>9</number>
          </property>
          <property name="bottomMargin">
           <number>9</number>
          </property>
          <item row="1" column="0">
           <widget class="QFrame" name="frame_3">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" name="gridLayout_3">
             <property name="leftMargin">
              <number>0</number>
             </property>
             <property name="topMargin">
              <number>0</number>
             </property>
             <property name="rightMargin">
              <number>0</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
             </property>
             <item row="1" column="0">
              <widget class="QLabel" name="m_TensorReconstructionThresholdLabel_2">
               <property name="text">
                <string>B0 Threshold</string>
               </property>
               <property name="wordWrap">
                <bool>false</bool>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="QSpinBox" name="m_TensorReconstructionThreshold">
               <property name="maximum">
                <number>10000</number>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QCheckBox" name="m_CheckNegativeEigenvalues">
            <property name="toolTip">
             <string>Only influences WLS reconstruction</string>
            </property>
            <property name="text">
             <string>Ignore voxels with negative eigenvalues</string>
            </property>
           </widget>
          </item>
          <item row="0" column="0">
           <widget class="QComboBox" name="m_ReconctructionMethodBox">
            <property name="currentIndex">
             <number>0</number>
            </property>
            <item>
             <property name="text">
              <string>ITK Linear Least Squares</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>With correction for negative eigenvalues</string>
             </property>
            </item>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QCommandLinkButton" name="m_StartReconstruction">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>Select raw DWI!</string>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string notr="true"/>
         </property>
         <property name="text">
          <string>Start Reconstruction</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Diffusion-weighted Image from Tensors</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QFrame" name="m_TensorsToDWIFrame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QFormLayout" name="formLayout_3">
          <property name="fieldGrowthPolicy">
           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
          </property>
          <property name="horizontalSpacing">
           <number>6</number>
          </property>
          <property name="verticalSpacing">
           <number>6</number>
          </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item row="0" column="0">
           <widget class="QLabel" name="m_TensorsToDWIBValueLabel">
            <property name="toolTip">
             <string comment="how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;" extracomment="how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;">how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;</string>
            </property>
            <property name="statusTip">
             <string comment="how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;" extracomment="how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;">how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;</string>
            </property>
            <property name="whatsThis">
             <string comment="how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;" extracomment="how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;">how fuzzy the confidence boundary should be. By default, confidence boundary is perfectly sharp (float); default: &quot;0&quot;</string>
            </property>
            <property name="text">
             <string>B-Value</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="m_TensorsToDWINumDirsLabel">
            <property name="text">
             <string>#Gradient Directions</string>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QComboBox" name="m_TensorsToDWINumDirsSelect">
            <property name="currentIndex">
             <number>3</number>
            </property>
            <item>
             <property name="text">
              <string>12</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>42</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>92</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>162</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>252</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>362</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>492</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>642</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>812</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>1002</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QSpinBox" name="m_TensorsToDWIBValueEdit">
            <property name="maximum">
             <number>10000</number>
            </property>
            <property name="singleStep">
             <number>100</number>
            </property>
            <property name="value">
             <number>1000</number>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QCommandLinkButton" name="m_TensorsToDWIButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>Estimates the original diffusion weighted image based on a reconstructed tensor image.</string>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string notr="true"/>
         </property>
         <property name="text">
          <string>Estimate DWI based on Tensor Image</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QGroupBox" name="groupBox_4">
      <property name="title">
       <string>ODF Image from Tensors</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_5">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_8">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QCommandLinkButton" name="m_TensorsToOdfButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string comment="Calculate ODF value as tensor value in the according direction" extracomment="Calculate ODF value as tensor value in the according direction">Calculate ODF value as tensor value in the according direction</string>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string notr="true"/>
         </property>
         <property name="text">
          <string>Start</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <widget class="QGroupBox" name="groupBox_5">
      <property name="title">
       <string>Calculate Residuals</string>
      </property>
      <property name="checkable">
       <bool>false</bool>
      </property>
      <property name="checked">
       <bool>false</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <property name="horizontalSpacing">
-       <number>0</number>
+       <number>6</number>
       </property>
       <item row="2" column="0">
        <widget class="QCheckBox" name="m_PercentagesOfOutliers">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>percentages of error</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QTabWidget" name="m_ResidualTab">
         <property name="currentIndex">
          <number>0</number>
         </property>
         <widget class="QWidget" name="tab">
          <attribute name="title">
           <string>Per volume</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_8">
           <item>
            <widget class="QmitkResidualAnalysisWidget" name="m_ResidualAnalysis" native="true">
             <property name="minimumSize">
              <size>
               <width>200</width>
               <height>300</height>
              </size>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
         <widget class="QWidget" name="tab_2">
          <attribute name="title">
           <string>Per slice</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_10">
           <item>
            <widget class="QLabel" name="label_2">
             <property name="text">
              <string>outliers per slice</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QFrame" name="frame_5">
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_2">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item>
               <widget class="QmitkResidualViewWidget" name="m_PerSliceView">
                <property name="maximumSize">
                 <size>
                  <width>300</width>
                  <height>400</height>
                 </size>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QFrame" name="frame_4">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Raised</enum>
                </property>
                <layout class="QVBoxLayout" name="verticalLayout_9">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
                 <item>
                  <widget class="QLabel" name="m_UpperLabel">
                   <property name="text">
                    <string/>
                   </property>
                  </widget>
                 </item>
                 <item>
                  <widget class="QGraphicsView" name="m_LegendView">
                   <property name="maximumSize">
                    <size>
                     <width>20</width>
                     <height>255</height>
                    </size>
                   </property>
                  </widget>
                 </item>
                 <item>
                  <widget class="QLabel" name="m_LowerLabel">
                   <property name="text">
                    <string/>
                   </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <widget class="QLabel" name="m_PositionLabel">
             <property name="text">
              <string>Volume: .., Slice:..</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QCommandLinkButton" name="m_ResidualButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>Calculate the residual from a dti and a dwi image</string>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string notr="true"/>
         </property>
         <property name="text">
          <string>Start</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkResidualAnalysisWidget</class>
    <extends>QWidget</extends>
    <header>QmitkResidualAnalysisWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkResidualViewWidget</class>
    <extends>QGraphicsView</extends>
    <header>QmitkResidualViewWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/mitkPluginActivator.cpp
index ceb16b327a..8f1c0a3c84 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/mitkPluginActivator.cpp
@@ -1,47 +1,49 @@
 /*===================================================================
 
 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 "mitkPluginActivator.h"
 
 #include "src/internal/QmitkQBallReconstructionView.h"
 #include "src/internal/QmitkTensorReconstructionView.h"
 #include "src/internal/QmitkDiffusionQuantificationView.h"
 #include "src/internal/QmitkODFDetailsView.h"
 #include "src/internal/Perspectives/QmitkReconstructionPerspective.h"
+#include "src/internal/Perspectives/QmitkQuantificationPerspective.h"
 
 ctkPluginContext* mitk::PluginActivator::m_Context = nullptr;
 
 ctkPluginContext* mitk::PluginActivator::GetContext()
 {
   return m_Context;
 }
 
 void mitk::PluginActivator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(QmitkReconstructionPerspective, context)
+  BERRY_REGISTER_EXTENSION_CLASS(QmitkQuantificationPerspective, context)
 
   BERRY_REGISTER_EXTENSION_CLASS(QmitkQBallReconstructionView, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionQuantificationView, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkTensorReconstructionView, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkODFDetailsView, context)
   m_Context = context;
 }
 
 void mitk::PluginActivator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
   m_Context = nullptr;
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/files.cmake
index 88ebeda4b0..0c53c6ac2e 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/files.cmake
@@ -1,46 +1,44 @@
 set(SRC_CPP_FILES
 
 
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
 
   QmitkHeadMotionCorrectionView.cpp
   QmitkSimpleRegistrationView.cpp
-  QmitkDwiRegistrationPerspective.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkHeadMotionCorrectionViewControls.ui
   src/internal/QmitkSimpleRegistrationViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
 
   src/internal/QmitkHeadMotionCorrectionView.h
   src/internal/QmitkSimpleRegistrationView.h
-  src/internal/QmitkDwiRegistrationPerspective.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 
   resources/diffusionregistration.png
 )
 
 set(QRC_FILES
 
 )
 
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/plugin.xml
index c66c507de8..91e656626c 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/plugin.xml
@@ -1,52 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
 
     <view id="org.mitk.views.headmotioncorrectionview"
     name="Head-Motion Correction"
     category="Registration"
     class="QmitkHeadMotionCorrectionView"
     icon="resources/diffusionregistration.png">
     <keywordReference id="org.mitk.views.headmotioncorrectionview.Keyword"/>
     </view>
 
     <view id="org.mitk.views.simpleregistrationview"
     name="Registration"
     category="Registration"
     class="QmitkSimpleRegistrationView"
     icon="resources/diffusionregistration.png">
     <keywordReference id="org.mitk.views.simpleregistrationview.Keyword"/>
     </view>
 
   </extension>
 
-  <extension point="org.blueberry.ui.perspectives">
-
-    <perspective id="org.mitk.perspectives.dwiregistration"
-    name="Registration"
-    class="QmitkDwiRegistrationPerspective"
-    icon="resources/diffusionregistration.png">
-    <description>This perspective contains views for rigid image registration and head motion correction.</description>
-    <keywordReference id="org.mitk.perspectives.dwiregistration.Keyword"/>
-    </perspective>
-
-  </extension>
-
   <extension point="org.blueberry.ui.keywords">
 
   <keyword label="registration" id="org.mitk.views.simpleregistrationview.Keyword"/>
   <keyword label="registration" id="org.mitk.views.headmotioncorrectionview.Keyword"/>
   <keyword label="motion" id="org.mitk.views.simpleregistrationview.Keyword"/>
   <keyword label="motion" id="org.mitk.views.headmotioncorrectionview.Keyword"/>
   <keyword label="head" id="org.mitk.views.simpleregistrationview.Keyword"/>
   <keyword label="head" id="org.mitk.views.headmotioncorrectionview.Keyword"/>
   <keyword label="align" id="org.mitk.views.simpleregistrationview.Keyword"/>
   <keyword label="align" id="org.mitk.views.headmotioncorrectionview.Keyword"/>
   <keyword label="register" id="org.mitk.views.simplerigidregistrationview.Keyword"/>
   <keyword label="register" id="org.mitk.views.headmotioncorrectionview.Keyword"/>
 
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkSimpleRegistrationViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkSimpleRegistrationViewControls.ui
index 67cb63db27..d0fad49d5b 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkSimpleRegistrationViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkSimpleRegistrationViewControls.ui
@@ -1,231 +1,279 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkSimpleRegistrationViewControls</class>
  <widget class="QWidget" name="QmitkSimpleRegistrationViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>435</width>
     <height>744</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+   <property name="verticalSpacing">
+    <number>25</number>
+   </property>
+   <item row="13" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+    </spacer>
+   </item>
+   <item row="3" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Image Registration</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item row="1" column="1">
-       <widget class="QmitkDataStorageComboBox" name="m_MovingImageBox"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Moving Image:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QmitkDataStorageComboBox" name="m_FixedImageBox"/>
-      </item>
-      <item row="1" column="2">
-       <widget class="QSpinBox" name="m_MovingChannelBox">
+      <item row="2" column="0">
+       <widget class="QCommandLinkButton" name="m_RegistrationStartButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
-         <string>Select dMRI volume used to calculate transformation.</string>
+         <string/>
+        </property>
+        <property name="text">
+         <string>Start Registration</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QSpinBox" name="m_FixedChannelBox">
-        <property name="enabled">
-         <bool>false</bool>
+      <item row="1" column="0">
+       <widget class="QFrame" name="frame_2">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
         </property>
-        <property name="toolTip">
-         <string>Select dMRI volume used to calculate transformation.</string>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
         </property>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="1">
+          <widget class="QComboBox" name="m_RegBox">
+           <item>
+            <property name="text">
+             <string>Rigid</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Affine</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Registration Type:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QCheckBox" name="m_RegOutputBox">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>Output Registration Object:</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Fixed Image:</string>
+       <widget class="QFrame" name="frame">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
         </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="1" column="1">
+          <widget class="QmitkDataStorageComboBox" name="m_MovingImageBox"/>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Moving Image:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QmitkDataStorageComboBox" name="m_FixedImageBox"/>
+         </item>
+         <item row="1" column="2">
+          <widget class="QSpinBox" name="m_MovingChannelBox">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>Select dMRI volume used to calculate transformation.</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <widget class="QSpinBox" name="m_FixedChannelBox">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>Select dMRI volume used to calculate transformation.</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Fixed Image:</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="13" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0">
-    <widget class="QFrame" name="frame_2">
+   <item row="5" column="0">
+    <widget class="QFrame" name="frame_3">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
+     <layout class="QGridLayout" name="gridLayout_5">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="m_RegBox">
-        <item>
-         <property name="text">
-          <string>Rigid</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Affine</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Registration Type:</string>
+      <item row="1" column="0">
+       <widget class="QCommandLinkButton" name="m_TractoRegistrationStartButton">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="m_RegOutputBox">
-        <property name="text">
+        <property name="toolTip">
          <string/>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>Output Registration Object:</string>
+         <string>Start Tractography Registration</string>
         </property>
        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QCommandLinkButton" name="m_RegistrationStartButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="text">
-      <string>Start Registration</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Tractography Registration</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
       <item row="0" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Registration Object:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QmitkDataStorageComboBox" name="m_RegObjectBox"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Tractogram:</string>
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
+         <string>Tractography Registration</string>
         </property>
+        <layout class="QGridLayout" name="gridLayout_4">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_5">
+           <property name="text">
+            <string>Registration Object:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QmitkDataStorageComboBox" name="m_RegObjectBox"/>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string>Tractogram:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QmitkDataStorageComboBox" name="m_TractoBox"/>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QmitkDataStorageComboBox" name="m_TractoBox"/>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QCommandLinkButton" name="m_TractoRegistrationStartButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="text">
-      <string>Start Tractography Registration</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/mitkPluginActivator.cpp
index ee12c7bdca..7432af3c10 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/mitkPluginActivator.cpp
@@ -1,43 +1,41 @@
 /*===================================================================
 
 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 "mitkPluginActivator.h"
 
 #include "src/internal/QmitkHeadMotionCorrectionView.h"
 #include "src/internal/QmitkSimpleRegistrationView.h"
-#include "src/internal/QmitkDwiRegistrationPerspective.h"
 
 
 ctkPluginContext* mitk::PluginActivator::m_Context = nullptr;
 
 ctkPluginContext* mitk::PluginActivator::GetContext()
 {
   return m_Context;
 }
 
 void mitk::PluginActivator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(QmitkHeadMotionCorrectionView, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkSimpleRegistrationView, context)
-  BERRY_REGISTER_EXTENSION_CLASS(QmitkDwiRegistrationPerspective, context)
   m_Context = context;
 }
 
 void mitk::PluginActivator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
   m_Context = nullptr;
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox
index b0c3201ed9..7e619f3e6f 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox
@@ -1,84 +1,95 @@
 /**
 \page org_mitk_views_streamlinetracking Streamline Tractography
 
 This view enables streamline tractography on various input data. The corresponding command line application is named "MitkStreamlineTractography".
 
 Available sections:
-  - \ref StrTrackUserManualInputData
-  - \ref StrTrackUserManualInteractive
-  - \ref StrTrackUserManualParameters
-  - \ref StrTrackUserManualAdvancedParameters
-  - \ref StrTrackUserManualReferences
+- \ref StrTrackUserManualInputData
+- \ref StrTrackUserManualSeeding
+- \ref StrTrackUserManualConstraints
+- \ref StrTrackUserManualParameters
+- \ref StrTrackUserManualNeighbourhoodSampling
+- \ref StrTrackUserManualDataHandling
+- \ref StrTrackUserManualPostprocessing
+- \ref StrTrackUserManualReferences
 
 \section StrTrackUserManualInputData Input Data
 
-Input:
-
 Select the data you want to track on in the datamanager. Supported file types are:
-\li One or multiple DTI images selected in the datamanager.
-\li One ODF image, e.g. obtained using MITK Q-ball reconstruction or MRtrix CSD (tractography similar to [6]).
-\li One peak image (4D float image).
-\li One raw diffusion-weighted image for machine learning based tractography [1].
+- One or multiple DTI images selected in the datamanager.
+- One ODF image, e.g. obtained using MITK Q-ball reconstruction or MRtrix CSD (tractography similar to [6]).
+- One peak image (4D float image).
+- One raw diffusion-weighted image for machine learning based tractography [1].
+-- Tractography Forest: Needed for machine learning based tractography [1].
+
+\section StrTrackUserManualSeeding Seeding
+
+Specify how, where and how many tractography seed points are placed. This can be either done statically using a seed image or in an interactive fashion. Interactive tractography enables the dynamic placement of spherical seed regions simply by clicking into the image (similar to [5]).
+
+Image based seeding:
+- Seed Image: ROI image used to define the seed voxels. If no seed mask is specified, the whole image volume is seeded.
+- Seeds per voxel: If set to 1, the seed is defined as the voxel center. If > 1 the seeds are distributet randomly inside the voxel.
+
+Interactive seeding:
+- Update on Parameter Change: When "Update on Parameter Change" is checked, each parameter change causes an instant retracking with the new parameters. This enables an intuitive exploration of the effects that the other tractography parameters have on the resulting tractogram.
+- Radius: Radius of the manually placed spherical seed region.
+- Num.Seeds: Number of seeds placed randomly inside the spherical seed region.
+
+Parameters for both seeding modes:
+- Trials Per Seed: Try each seed N times until a valid streamline is obtained (only for probabilistic tractography).
+- Max. Num. Fibers: Tractography is stopped after the desired number of fibers is reached, even before all seed points are processed.
 
-Optional Input:
+\section StrTrackUserManualConstraints ROI Constraints
 
-- Mask used to define the seed voxels. If no seed mask is specified, the whole image volume is seeded.
-- Mask used to constrain the generated streamlines. Streamlines can not leave the mask area.
-- Binary mask used to define stopping regions. Streamlines that enter the mask area are stopped immediately.
-- Endpoint Constraints: Determines what fibers are accepted based on their endpoint location. Options are:
+Specify various ROI and mask images to constrain the tractography process.
+
+- Mask Image: ROI image used to constrain the generated streamlines, typically a brain mask. Streamlines that leave the regions defined in this image will stop immediately.
+- Stop Image: ROI image used to define stopping regions. Streamlines that enter the regions defined in this image will stop immediately.
+- Endpoint Constraints: Determines which fibers are accepted based on their endpoint location. Options are:
   - No constraints on endpoint locations (command line option NONE)
   - Both EPs are required to be located in the target image (command line option EPS_IN_TARGET)
   - Both EPs are required to be located in the target image and the image values at the respective position needs to be distinct (command line option EPS_IN_TARGET_LABELDIFF)
   - One EP is required to be located in the seed image and one in the target image (command line option EPS_IN_SEED_AND_TARGET)
   - At least one EP is required to be located in the target image (command line option MIN_ONE_EP_IN_TARGET)
   - Exactly one EP is required to be located in the target image (command line option ONE_EP_IN_TARGET)
   - No EP is allowed to be located in the target image (command line option NO_EP_IN_TARGET)
-- Mask to define the target region needed for endpoint constraints.
-- FA/GFA image used to determine streamline termination. If no image is specified, the FA/GFA image is automatically calculated from the input image. If multiple tensor images are used as input, it is recommended to provide such an image since the FA maps calculated from the individual input tensor images can not provide a suitable termination criterion.
-- Tractography Forest: Needed for machine learning based tractography [1].
-
-\section StrTrackUserManualInteractive Interactive Tractography
+- Target Image: ROI image needed for endpoint constraints.
 
-Interactive tractography enables the dynamic placement of spherical seed regions simply by clicking into the image (similar to [5]). Parameters are the number of seed points and the radius of the spherical seed region. The seed points are randomly distributed inside the sphere around the selected position. By clicking and holding the left mouse button while moving the mouse around the image, the fiber connections originating from the selected region can be explored dynamically.
-When "Update on Parameter Change" is checked, each parameter change causes an instant retracking with the new parameters. This enables an intuitive exploration of the effcts that the individual parameters have on the resulting tractogram.
+\section StrTrackUserManualParameters Tractography Parameters
 
-\section StrTrackUserManualParameters Parameters
-
-\li Mode: Toggle between deterministic and probabilistic tractography. Peak tracking only supports deterministic mode. The probabilistic method simply samples the output direction from the discrete probability ditribution provided by the discretized ODF.
-\li Seeds per voxel: If set to 1, the seed is defined as the voxel center. If > 1 the seeds are distributet randomly inside the voxel.
-\li Max. num. fibers: Tractography is stopped after the desired number of fibers is reached, even before all seed points are processed.
-\li Cutoff: If the streamline reaches a position with an FA value or peak magnitude lower than the speciefied threshold, tracking is terminated. Typical values are 0.2 for FA/GFA and 0.1 for CSD peaks.
-\li ODF Cutoff: Additional threshold on the ODF magnitude. This is useful in case of CSD fODF tractography. For MRtrix CSD fODF images, a typical value is 0.1.
-\li Sharpen ODFs: If you are using dODF images as input, it is advisable to sharpen the ODFs (min-max normalize and raise to the power of 4). This is not necessary (and not recommended) for CSD fODFs, since they are naturally much sharper.
-
-\section StrTrackUserManualAdvancedParameters Advanced Parameters
-\li Step Size: The algorithm proceeds along the streamline with a fixed stepsize. Default is 0.5*minSpacing.
-\li Angular threshold: Maximum angle between two successive steps (in degree). Default is 90° * step_size. For probabilistic tractography, candidate directions exceeding this threshold have probability 0, i.e. the respective ODF value is set to zero. The probabilities of the valid directions are normalized to sum to 1.
-\li Min. Tract Length: Shorter fibers are discarded.
-\li Loop Check: Stop streamline if the threshold on the angular stdev over the last 4 voxel lengths is exceeded. -1 = no loop check.
-\li Trials Per Seed: Try each seed N times until a valid streamline is obtained (only for probabilistic tractography).
-\li f and g values to balance between FACT [2] and TEND [3,4] tracking (only for tensor based tractography). For further information please refer to [2,3]
-\li Flip directions: Internally flips progression directions. This might be necessary depending on the input data.
-\li Enable Trilinear Interpolation: By default the image values are interpolated. Keep in mind that in the noninterpolated case, the TEND term is only applied once per voxel. In the interpolated case the TEND term is applied at each integration step which results in much higher curvatures and has to be compensated by an according choice of f and g.
-\li Enable Gray Matter Seeding: Seeds are onyl placed inside of the gray matter. Needs tissue label image.
+- Mode: Toggle between deterministic and probabilistic tractography. Peak tracking only supports deterministic mode. The probabilistic method simply samples the output direction from the discrete probability ditribution provided by the discretized ODF.
+- Sharpen ODFs: If you are using dODF images as input, it is advisable to sharpen the ODFs (min-max normalize and raise to the power of 4). This is not necessary (and not recommended) for CSD fODFs, since they are naturally much sharper.
+- Cutoff: If the streamline reaches a position with an FA value or peak magnitude lower than the speciefied threshold, tracking is terminated. Typical values are 0.2 for FA/GFA and 0.1 for CSD peaks.
+- FA/GFA image used to determine streamline termination. If no image is specified, the FA/GFA image is automatically calculated from the input image. If multiple tensor images are used as input, it is recommended to provide such an image since the FA maps calculated from the individual input tensor images can not provide a suitable termination criterion.
+- ODF Cutoff: Additional threshold on the ODF magnitude. This is useful in case of CSD fODF tractography. For fODFs a good default value is 0.1, for normalized dODFs, e.g. Q-ball ODFs, this threshold should be very low (0.00025) or 0.
+- Step Size: The algorithm proceeds along the streamline with a fixed stepsize. Default is 0.5*minSpacing.
+- Min. Tract Length: Shorter fibers are discarded.
+- Angular threshold: Maximum angle between two successive steps (in degree). Default is 90° * step_size. For probabilistic tractography, candidate directions exceeding this threshold have probability 0, i.e. the respective ODF value is set to zero. The probabilities of the valid directions are normalized to sum to 1.
+- Loop Check: Stop streamline if the threshold on the angular stdev over the last 4 voxel lengths is exceeded. -1 = no loop check.
+- f and g values to balance between FACT [2] and TEND [3,4] tracking (only for tensor based tractography). For further information please refer to [2,3]
+
+\section StrTrackUserManualDataHandling Data Handling
+- Flip directions: Internally flips progression directions. This might be necessary depending on the input data.
+- Interpolate Tractography Data: Trilinearly interpolate the input image used for tractography.
+- Interpolate ROI Images: Trilinearly interpolate the ROI images used to constrain the tractography.
 
 \section StrTrackUserManualNeighbourhoodSampling Neighbourhood Sampling (for details see [1])
-\li Neighborhood Samples: Number of neighborhood samples that are used to determine the next fiber progression direction.
-\li Sampling Distance: Distance of the sampling positions from the current streamline position (in voxels).
-\li Use Only Frontal Samples: Only neighborhood samples in front of the current streamline position are considered.
-\li Use Stop-Votes: If checked, the majority of sampling points has to place a stop-vote for the streamline to terminate. If not checked, all sampling positions have to vote for a streamline termination.
+- Neighborhood Samples: Number of neighborhood samples that are used to determine the next fiber progression direction.
+- Sampling Distance: Distance of the sampling positions from the current streamline position (in voxels).
+- Use Only Frontal Samples: Only neighborhood samples in front of the current streamline position are considered.
+- Use Stop-Votes: If checked, the majority of sampling points has to place a stop-vote for the streamline to terminate. If not checked, all sampling positions have to vote for a streamline termination.
 
 \section StrTrackUserManualPostprocessing Output and Postprocessing
-\li Compress Fibers: Whole brain tractograms obtained with a small step size can contain billions of points. The tractograms can be compressed by removing points that do not really contribute to the fiber shape, such as many points on a straight line. An error threshold (in mm) can be defined to specify which points should be removed and which not.
-\li Output Probability Map: No streamline are generated. Instead, the tractography outputs a probability map that indicates the probability of a fiber to reach a voxel from the selected seed region. For this measure to be sensible, the number of seeds per voxel needs to be rather large.
+- Compress Fibers: Whole brain tractograms obtained with a small step size can contain billions of points. The tractograms can be compressed by removing points that do not really contribute to the fiber shape, such as many points on a straight line. An error threshold (in mm) can be defined to specify which points should be removed and which not.
+- Output Probability Map: No streamline are generated. Instead, the tractography outputs a visitation-count map that indicates the probability of a fiber to reach a voxel from the selected seed region. For this measure to be sensible, the number of seeds per voxel needs to be rather large.
 
 \section StrTrackUserManualReferences References
 
 [1] Neher, Peter F., Marc-Alexandre Côté, Jean-Christophe Houde, Maxime Descoteaux, and Klaus H. Maier-Hein. “Fiber Tractography Using Machine Learning.” NeuroImage. Accessed July 19, 2017. doi:10.1016/j.neuroimage.2017.07.028.\n
 [2] Mori, Susumu, Walter E. Kaufmann, Godfrey D. Pearlson, Barbara J. Crain, Bram Stieltjes, Meiyappan Solaiyappan, and Peter C. M. Van Zijl. “In Vivo Visualization of Human Neural Pathways by Magnetic Resonance Imaging.” Annals of Neurology 47 (2000): 412–414.\n
 [3] Weinstein, David, Gordon Kindlmann, and Eric Lundberg. “Tensorlines: Advection-Diffusion Based Propagation through Diffusion Tensor Fields.” In Proceedings of the Conference on Visualization’99: Celebrating Ten Years, 249–253, n.d.\n
 [4] Lazar, Mariana, David M. Weinstein, Jay S. Tsuruda, Khader M. Hasan, Konstantinos Arfanakis, M. Elizabeth Meyerand, Benham Badie, et al. “White Matter Tractography Using Diffusion Tensor Deflection.” Human Brain Mapping 18, no. 4 (2003): 306–321.\n
 [5] Chamberland, M., K. Whittingstall, D. Fortin, D. Mathieu, and M. Descoteaux. “Real-Time Multi-Peak Tractography for Instantaneous Connectivity Display.” Front Neuroinform 8 (2014): 59. doi:10.3389/fninf.2014.00059.\n
 [6] Tournier, J-Donald, Fernando Calamante, and Alan Connelly. “MRtrix: Diffusion Tractography in Crossing Fiber Regions.” International Journal of Imaging Systems and Technology 22, no. 1 (March 2012): 53–66. doi:10.1002/ima.22005.
 
 */
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/files.cmake
index dc3967cfd7..42137f0e9c 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/files.cmake
@@ -1,62 +1,58 @@
 set(SRC_CPP_FILES
   QmitkMlbstTrainingDataWidget.cpp
 )
 
 set(INTERNAL_CPP_FILES
   QmitkGibbsTrackingView.cpp
   QmitkStreamlineTrackingView.cpp
   QmitkMLBTView.cpp
 
-  Perspectives/QmitkMachineLearningTractographyPerspective.cpp
   Perspectives/QmitkGibbsTractographyPerspective.cpp
   Perspectives/QmitkStreamlineTractographyPerspective.cpp
 
   mitkPluginActivator.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkGibbsTrackingViewControls.ui
   src/internal/QmitkStreamlineTrackingViewControls.ui
   src/internal/QmitkMLBTViewControls.ui
 
   src/QmitkMlbstTrainingDataWidgetControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
 
   src/internal/QmitkGibbsTrackingView.h
   src/internal/QmitkStreamlineTrackingView.h
   src/internal/QmitkMLBTView.h
 
   src/QmitkMlbstTrainingDataWidget.h
 
-  src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.h
   src/internal/Perspectives/QmitkGibbsTractographyPerspective.h
   src/internal/Perspectives/QmitkStreamlineTractographyPerspective.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 
-  resources/tractography.png
-  resources/fiberTracking1.png
-  resources/StreamlineTracking.png
-  resources/GibbsTracking.png
+  resources/tract.png
+  resources/tractogram.png
   resources/ml_tractography.png
 )
 
 set(QRC_FILES
 
 )
 
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/plugin.xml
index d17b5a81e4..cff08b366e 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/plugin.xml
@@ -1,99 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
 
     <view id="org.mitk.views.gibbstracking"
     name="Global Gibbs Tractography"
     category="Fiber Tractography"
     class="QmitkGibbsTrackingView"
-    icon="resources/GibbsTracking.png">
+    icon="resources/tractogram.png">
     <keywordReference id="org.mitk.views.gibbstracking.Keyword"/>
     </view>
 
     <view id="org.mitk.views.streamlinetracking"
     name="Streamline Tractography"
     category="Fiber Tractography"
     class="QmitkStreamlineTrackingView"
-    icon="resources/fiberTracking1.png">
+    icon="resources/tract.png">
     <keywordReference id="org.mitk.views.streamlinetracking.Keyword"/>
     </view>
 
     <view id="org.mitk.views.mlbtview"
     name="ML-Based Tractography Training"
     category="Fiber Tractography"
     class="QmitkMLBTView"
     icon="resources/ml_tractography.png">
     <keywordReference id="org.mitk.views.mlbtview.Keyword"/>
     </view>
 
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
 
   <keyword label="tractography" id="org.mitk.views.gibbstracking.Keyword"/>
   <keyword label="tracking" id="org.mitk.views.gibbstracking.Keyword"/>
   <keyword label="fiber" id="org.mitk.views.gibbstracking.Keyword"/>
   <keyword label="global" id="org.mitk.views.gibbstracking.Keyword"/>
   <keyword label="gibbs" id="org.mitk.views.gibbstracking.Keyword"/>
   <keyword label="diffusion" id="org.mitk.views.gibbstracking.Keyword"/>
 
   <keyword label="tractography" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="tracking" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="fiber" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="deterministic" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="probabilistic" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="odf" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="peak" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="streamline" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="tend" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="tensorline" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="tensorlines" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="multi" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="tensor" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="dti" id="org.mitk.views.streamlinetracking.Keyword"/>
   <keyword label="diffusion" id="org.mitk.views.streamlinetracking.Keyword"/>
 
   <keyword label="tractography" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="tracking" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="fiber" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="machine" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="learning" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="streamline" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="tensor" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="dwi" id="org.mitk.views.mlbtview.Keyword"/>
   <keyword label="diffusion" id="org.mitk.views.mlbtview.Keyword"/>
 
   </extension>
 
 
   <extension point="org.blueberry.ui.perspectives">
 
     <perspective id="org.mitk.perspectives.tractography1"
     name="Global Gibbs Tractography"
     category="Fiber Tractography"
     class="QmitkGibbsTractographyPerspective"
-    icon="resources/tractography.png">
-    <keywordReference id="org.mitk.perspectives.tractography1.Keyword"/>
+    icon="resources/tractogram.png">
+    <keywordReference id="org.mitk.views.gibbstracking.Keyword"/>
     </perspective>
 
     <perspective id="org.mitk.perspectives.tractography2"
     name="Streamline Tractography"
     category="Fiber Tractography"
     class="QmitkStreamlineTractographyPerspective"
-    icon="resources/fiberTracking1.png">
-    <keywordReference id="org.mitk.perspectives.tractography2.Keyword"/>
-    </perspective>
-
-    <perspective id="org.mitk.perspectives.tractography4"
-    name="ML-Based Tractography Training"
-    category="Fiber Tractography"
-    class="QmitkMachineLearningTractographyPerspective"
-    icon="resources/ml_tractography.png">
-    <keywordReference id="org.mitk.perspectives.tractography4.Keyword"/>
+    icon="resources/tract.png">
+    <keywordReference id="org.mitk.views.streamlinetracking.Keyword"/>
     </perspective>
 
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/GibbsTracking.png b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/GibbsTracking.png
index 9582dd772d..993ad933b8 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/GibbsTracking.png and b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/GibbsTracking.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/StreamlineTracking.png b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/StreamlineTracking.png
deleted file mode 100644
index 5d8d143597..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/StreamlineTracking.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/fiberTracking1.png b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/fiberTracking1.png
deleted file mode 100644
index e70c3c154c..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/fiberTracking1.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/ml_tractography.png b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/ml_tractography.png
index 7c1d7af374..cceac802c9 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/ml_tractography.png and b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/ml_tractography.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tract.png b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tract.png
new file mode 100644
index 0000000000..a98bb20f61
Binary files /dev/null and b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tract.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tractogram.png b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tractogram.png
new file mode 100644
index 0000000000..98df10cf69
Binary files /dev/null and b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tractogram.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tractography.png b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tractography.png
deleted file mode 100644
index 9582dd772d..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/resources/tractography.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkGibbsTractographyPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkGibbsTractographyPerspective.cpp
index fc805e1180..d3d530a1cc 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkGibbsTractographyPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkGibbsTractographyPerspective.cpp
@@ -1,50 +1,48 @@
 /*===================================================================
 
 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 "QmitkGibbsTractographyPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkGibbsTractographyPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
-    /////////////////////////////////////////////////////
-    // all di-app perspectives should have the following:
-    /////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////
+  // all di-app perspectives should have the following:
+  /////////////////////////////////////////////////////
 
-    QString editorArea = layout->GetEditorArea();
+  QString editorArea = layout->GetEditorArea();
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
-    layout->AddStandaloneView("org.mitk.views.datamanager",
-                              false, berry::IPageLayout::LEFT, 0.3f, editorArea);
+  layout->AddStandaloneView("org.mitk.views.datamanager",
+                            false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
-    layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
-                              false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
+  layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
+                            false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
-    berry::IFolderLayout::Pointer left =
-            layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
-                                 berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
+  berry::IFolderLayout::Pointer left =
+      layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
+                           berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
-                                         berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
+                                       berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
-    /////////////////////////////////////////////
-    // here goes the perspective specific stuff
-    /////////////////////////////////////////////
+  /////////////////////////////////////////////
+  // here goes the perspective specific stuff
+  /////////////////////////////////////////////
 
-    left->AddView("org.mitk.views.gibbstracking");
-    left->AddView("org.mitk.views.qballreconstruction");
-    left->AddView("org.mitk.views.tensorreconstruction");
+  left->AddView("org.mitk.views.gibbstracking");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkStreamlineTractographyPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkStreamlineTractographyPerspective.cpp
index 896f44a280..e14766ec2a 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkStreamlineTractographyPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkStreamlineTractographyPerspective.cpp
@@ -1,50 +1,49 @@
 /*===================================================================
 
 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 "QmitkStreamlineTractographyPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkStreamlineTractographyPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
-    /////////////////////////////////////////////////////
-    // all di-app perspectives should have the following:
-    /////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////
+  // all di-app perspectives should have the following:
+  /////////////////////////////////////////////////////
 
-    QString editorArea = layout->GetEditorArea();
+  QString editorArea = layout->GetEditorArea();
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
-    layout->AddStandaloneView("org.mitk.views.datamanager",
-                              false, berry::IPageLayout::LEFT, 0.3f, editorArea);
+  layout->AddStandaloneView("org.mitk.views.datamanager",
+                            false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
-    layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
-                              false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
+  layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
+                            false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
-    berry::IFolderLayout::Pointer left =
-            layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
-                                 berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
+  berry::IFolderLayout::Pointer left =
+      layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
+                           berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
-    layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
-                                         berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
+  layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
+                                       berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
-    /////////////////////////////////////////////
-    // here goes the perspective specific stuff
-    /////////////////////////////////////////////
+  /////////////////////////////////////////////
+  // here goes the perspective specific stuff
+  /////////////////////////////////////////////
 
-    left->AddView("org.mitk.views.streamlinetracking");
-    left->AddView("org.mitk.views.segmentation");
-    left->AddView("org.mitk.views.odfmaximaextraction");
+  left->AddView("org.mitk.views.streamlinetracking");
+  left->AddView("org.mitk.views.segmentation");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkGibbsTrackingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkGibbsTrackingViewControls.ui
index fff3691d3f..5df82d4acc 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkGibbsTrackingViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkGibbsTrackingViewControls.ui
@@ -1,1121 +1,1157 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkGibbsTrackingViewControls</class>
  <widget class="QWidget" name="QmitkGibbsTrackingViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>463</width>
     <height>1011</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
    </property>
    <item row="1" column="0" colspan="2">
     <widget class="QFrame" name="frame_4">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
      <property name="lineWidth">
       <number>0</number>
      </property>
      <layout class="QGridLayout" name="gridLayout_8">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <property name="spacing">
-       <number>0</number>
+       <number>6</number>
       </property>
       <item row="1" column="0">
        <widget class="QCommandLinkButton" name="m_TrackingStart">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>No ODF/tensor image selected.</string>
         </property>
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
         <property name="text">
          <string>Start Tractography</string>
         </property>
         <property name="icon">
          <iconset resource="../../../../Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc">
           <normaloff>:/QtWidgetsExt/play.xpm</normaloff>:/QtWidgetsExt/play.xpm</iconset>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QCommandLinkButton" name="m_TrackingStop">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string/>
         </property>
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
         <property name="text">
          <string>Stop Tractography</string>
         </property>
         <property name="icon">
          <iconset resource="../../../../Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc">
           <normaloff>:/QtWidgetsExt/stop.xpm</normaloff>:/QtWidgetsExt/stop.xpm</iconset>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="QGroupBox" name="m_ParametersFrame">
      <property name="title">
       <string>Parameters</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_5">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="1" column="0">
        <widget class="QLabel" name="m_CurvatureThresholdLabel_3">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Output File:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QCheckBox" name="m_AdvancedSettingsCheckbox">
         <property name="text">
          <string>Advanced Settings</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QCheckBox" name="m_VisualizationCheckbox">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="toolTip">
          <string>Activate continuous visualization of intermediate results.</string>
         </property>
         <property name="text">
          <string>Visualize Tractography</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QFrame" name="frame_2">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Plain</enum>
         </property>
         <property name="lineWidth">
          <number>0</number>
         </property>
         <layout class="QGridLayout" name="gridLayout">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <property name="spacing">
           <number>0</number>
          </property>
          <item row="1" column="1">
           <widget class="QToolButton" name="m_OutputFileButton">
            <property name="toolTip">
             <string>Select output file name and folder.</string>
            </property>
            <property name="text">
             <string>...</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLineEdit" name="m_OutputFileLabel">
            <property name="text">
             <string>N/A</string>
            </property>
            <property name="readOnly">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="2" column="2">
        <widget class="QToolButton" name="m_VisualizeOnceButton">
         <property name="toolTip">
          <string>Visualize intermediate result.</string>
         </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../../org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc">
           <normaloff>:/QmitkDiffusionImaging/Refresh_48.png</normaloff>:/QmitkDiffusionImaging/Refresh_48.png</iconset>
         </property>
         <property name="checkable">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="m_IterationsLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Iterations:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="QLineEdit" name="m_IterationsBox">
         <property name="text">
          <string>1e9</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QFrame" name="m_AdvancedFrame">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="leftMargin">
-       <number>9</number>
+       <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>9</number>
+       <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <property name="spacing">
-       <number>4</number>
+       <number>6</number>
       </property>
       <item row="2" column="0">
        <widget class="QLabel" name="m_ParticleWidthLabel_2">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Particle Width:</string>
         </property>
        </widget>
       </item>
       <item row="6" column="1">
        <widget class="QLabel" name="m_InExBalanceLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>0</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
        <widget class="QLabel" name="m_StartTempLabel">
         <property name="text">
          <string>0.1</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="m_ParticleWeightLabel_2">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Particle Weight:</string>
         </property>
        </widget>
       </item>
       <item row="5" column="2">
        <widget class="QSlider" name="m_EndTempSlider">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>99</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="value">
          <number>10</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="4" column="0">
        <widget class="QLabel" name="m_StartTempLabel_2">
         <property name="text">
          <string>Start Temperature:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="2">
        <widget class="QSlider" name="m_ParticleWeightSlider">
         <property name="toolTip">
          <string>automatic estimation from gfa map and ODF data.</string>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>1000</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="value">
          <number>0</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="invertedControls">
          <bool>true</bool>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="6" column="2">
        <widget class="QSlider" name="m_InExBalanceSlider">
         <property name="toolTip">
          <string>IE Bias &lt; 0 &lt; EE Bias</string>
         </property>
         <property name="minimum">
          <number>-50</number>
         </property>
         <property name="maximum">
          <number>50</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="5" column="1">
        <widget class="QLabel" name="m_EndTempLabel">
         <property name="text">
          <string>0.001</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="8" column="0">
        <widget class="QLabel" name="m_CurvatureThresholdLabel_2">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Curvature Threshold:</string>
         </property>
        </widget>
       </item>
       <item row="6" column="0">
        <widget class="QLabel" name="m_InExBalanceLabel_2">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Balance In/Ex Energy:</string>
         </property>
        </widget>
       </item>
       <item row="8" column="1">
        <widget class="QLabel" name="m_CurvatureThresholdLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>45°</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="2" column="2">
        <widget class="QSlider" name="m_ParticleWidthSlider">
         <property name="toolTip">
          <string>auto = 0.5 * min. spacing; sigma</string>
         </property>
         <property name="maximum">
          <number>100</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="m_ParticleLengthLabel_2">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Particle Length:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="m_ParticleLengthLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>auto</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="7" column="0">
        <widget class="QLabel" name="m_FiberLengthLabel_2">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Min. Fiber Length:</string>
         </property>
        </widget>
       </item>
       <item row="7" column="2">
        <widget class="QSlider" name="m_FiberLengthSlider">
         <property name="toolTip">
          <string>Only fibers longer than specified are accepted.</string>
         </property>
         <property name="maximum">
          <number>500</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="value">
          <number>20</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="8" column="2">
        <widget class="QSlider" name="m_CurvatureThresholdSlider">
         <property name="toolTip">
          <string>Allow only fiber curvature values smaller than the selected threshold.</string>
         </property>
         <property name="maximum">
          <number>180</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="value">
          <number>45</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="5" column="0">
        <widget class="QLabel" name="m_EndTempLabel_2">
         <property name="text">
          <string>End Temperature:</string>
         </property>
        </widget>
       </item>
       <item row="7" column="1">
        <widget class="QLabel" name="m_FiberLengthLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>20mm</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QLabel" name="m_ParticleWeightLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>auto</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="4" column="2">
        <widget class="QSlider" name="m_StartTempSlider">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>100</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="value">
          <number>10</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="invertedAppearance">
          <bool>false</bool>
         </property>
         <property name="invertedControls">
          <bool>false</bool>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="m_ParticleWidthLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>auto</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QSlider" name="m_ParticleLengthSlider">
         <property name="toolTip">
          <string>auto = 1.5 * min. spacing; l</string>
         </property>
         <property name="maximum">
          <number>100</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
       <item row="9" column="0">
        <widget class="QLabel" name="m_CurvatureThresholdLabel_4">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Random Seed</string>
         </property>
        </widget>
       </item>
       <item row="9" column="1">
        <widget class="QLabel" name="m_RandomSeedLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>auto</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="9" column="2">
        <widget class="QSlider" name="m_RandomSeedSlider">
         <property name="toolTip">
          <string>auto = 1.5 * min. spacing; l</string>
         </property>
         <property name="minimum">
          <number>-1</number>
         </property>
         <property name="maximum">
          <number>100</number>
         </property>
         <property name="singleStep">
          <number>1</number>
         </property>
         <property name="value">
          <number>-1</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::NoTicks</enum>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="4" column="0" colspan="2">
     <widget class="QFrame" name="frame_3">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
      <property name="lineWidth">
       <number>0</number>
      </property>
-     <layout class="QGridLayout" name="gridLayout_7">
+     <layout class="QGridLayout" name="gridLayout_7" rowstretch="0">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <property name="spacing">
-       <number>0</number>
+       <number>6</number>
       </property>
       <item row="0" column="0">
        <widget class="QCommandLinkButton" name="m_SaveTrackingParameters">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="toolTip">
          <string>Save current parameters as xml (.gtp)</string>
         </property>
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
         <property name="text">
          <string>Save Parameters</string>
         </property>
         <property name="icon">
          <iconset resource="../../../../Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc">
           <normaloff>:/QtWidgetsExt/btnMoveDown.png</normaloff>:/QtWidgetsExt/btnMoveDown.png</iconset>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QCommandLinkButton" name="m_LoadTrackingParameters">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="toolTip">
          <string>Load parameters from xml file (.gtp)</string>
         </property>
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
         <property name="text">
          <string>Load Parameters</string>
         </property>
         <property name="icon">
          <iconset resource="../../../../Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc">
           <normaloff>:/QtWidgetsExt/btnMoveUp.png</normaloff>:/QtWidgetsExt/btnMoveUp.png</iconset>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="6" column="1">
     <spacer name="spacer1">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="0" colspan="2">
     <widget class="QGroupBox" name="m_DataFrame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Please Select Input Data</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="text">
          <string>ODF/Tensor Image:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="m_OdfImageLabel">
         <property name="toolTip">
          <string>Mandatory input</string>
         </property>
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;mandatory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Mask Image:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="m_MaskImageLabel">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White matter probability mask image.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#969696;&quot;&gt;optional&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox_4">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Monitor</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <property name="spacing">
+       <number>6</number>
+      </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_23">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Progress:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="m_CurrentStepLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>-</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_21">
         <property name="toolTip">
          <string comment="Will only be updated if tracking is visualized" extracomment="Will only be updated if tracking is visualized">Will only be updated if tracking is visualized</string>
         </property>
         <property name="statusTip">
          <string>Will only be updated if tracking is visualized</string>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Accepted Fibers:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_24">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Connections:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_25">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Particles:</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0">
        <widget class="QLabel" name="label_27">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Proposal Acceptance Rate:</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0">
        <widget class="QLabel" name="label_26">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>Tracking Time:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="m_AcceptedFibersLabel">
         <property name="toolTip">
          <string>Will only be updated if tracking is visualized</string>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>-</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="m_NumConnectionsLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>-</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QLabel" name="m_NumParticlesLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>-</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
        <widget class="QLabel" name="m_ProposalAcceptance">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>-</string>
         </property>
        </widget>
       </item>
       <item row="5" column="1">
        <widget class="QLabel" name="m_TrackingTimeLabel">
         <property name="toolTip">
          <string/>
         </property>
         <property name="statusTip">
          <string/>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>-</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
   <include location="../../../../Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc"/>
   <include location="../../../org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTViewControls.ui
index f83ff99b89..3ac10492fe 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTViewControls.ui
@@ -1,421 +1,433 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkMLBTViewControls</class>
  <widget class="QWidget" name="QmitkMLBTViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>446</width>
+    <width>476</width>
     <height>548</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_8">
    <item row="0" column="0">
     <widget class="QFrame" name="frame_2">
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item row="2" column="0">
        <widget class="QFrame" name="frame_6">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_9">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item row="1" column="3">
           <widget class="QToolButton" name="m_RemoveTwButton">
            <property name="toolTip">
             <string>Remove training data pair</string>
            </property>
            <property name="text">
             <string>...</string>
            </property>
            <property name="icon">
             <iconset resource="../../../org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc">
              <normaloff>:/org_mitk_icons/icons/tango/scalable/actions/list-remove.svg</normaloff>:/org_mitk_icons/icons/tango/scalable/actions/list-remove.svg</iconset>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QToolButton" name="m_AddTwButton">
            <property name="toolTip">
             <string>Add additional training data pair</string>
            </property>
            <property name="text">
             <string>...</string>
            </property>
            <property name="icon">
             <iconset resource="../../../org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc">
              <normaloff>:/org_mitk_icons/icons/tango/scalable/actions/list-add.svg</normaloff>:/org_mitk_icons/icons/tango/scalable/actions/list-add.svg</iconset>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label_9">
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;It is recommended to use the command line application 'RfTraining' instead of this graphical user interface for the training process. Additional feature images are not supported here.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;The GUI is intended for testing using small examples.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="textFormat">
          <enum>Qt::RichText</enum>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
         <property name="margin">
          <number>5</number>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QFrame" name="m_TwFrame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_10">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <property name="horizontalSpacing">
           <number>0</number>
          </property>
          <property name="verticalSpacing">
           <number>6</number>
          </property>
          <item row="0" column="0">
           <widget class="QFrame" name="frame_7">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" name="gridLayout_11">
             <property name="leftMargin">
              <number>0</number>
             </property>
             <property name="topMargin">
              <number>0</number>
             </property>
             <property name="rightMargin">
              <number>0</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
             </property>
             <property name="spacing">
              <number>0</number>
             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_6">
               <property name="text">
                <string>Input DWI:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="QLabel" name="label_19">
               <property name="text">
                <string>Reference Tractogram:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="2">
              <widget class="QLabel" name="label_20">
               <property name="text">
                <string>Mask:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="3">
              <widget class="QLabel" name="label_21">
               <property name="text">
                <string>WM:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QFrame" name="frame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item row="4" column="1">
           <widget class="QDoubleSpinBox" name="m_SampleFractionBox">
            <property name="statusTip">
             <string>Fraction of samples used to train each tree.</string>
            </property>
            <property name="decimals">
             <number>3</number>
            </property>
            <property name="maximum">
             <double>1.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.100000000000000</double>
            </property>
            <property name="value">
             <double>0.700000000000000</double>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>Num. Trees:</string>
            </property>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Sample Fraction:</string>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>Max. Depth:</string>
            </property>
           </widget>
          </item>
          <item row="7" column="1">
           <widget class="QDoubleSpinBox" name="m_TrainingStepSizeBox">
            <property name="statusTip">
             <string>Fiber sampling in mm. Determines the number of white-matter samples (-1 = auto).</string>
            </property>
            <property name="decimals">
             <number>3</number>
            </property>
            <property name="minimum">
             <double>-1.000000000000000</double>
            </property>
            <property name="maximum">
             <double>999.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.100000000000000</double>
            </property>
            <property name="value">
             <double>-1.000000000000000</double>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QSpinBox" name="m_NumTreesBox">
            <property name="toolTip">
             <string>Number of tress in the final random forest.</string>
            </property>
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="maximum">
             <number>999999999</number>
            </property>
            <property name="value">
             <number>30</number>
            </property>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_3">
            <property name="text">
             <string>Non-WM Sampling Points:</string>
            </property>
           </widget>
          </item>
          <item row="7" column="0">
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Fiber Sampling:</string>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QSpinBox" name="m_MaxDepthBox">
            <property name="statusTip">
             <string>Maximum tree depth.</string>
            </property>
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="maximum">
             <number>999999999</number>
            </property>
            <property name="value">
             <number>25</number>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="QSpinBox" name="m_GmSamplingBox">
            <property name="toolTip">
             <string>Number of sampling points outside of the white-matter (-1 = automatic estimation).</string>
            </property>
            <property name="minimum">
             <number>-1</number>
            </property>
            <property name="maximum">
             <number>999999999</number>
            </property>
            <property name="value">
             <number>-1</number>
            </property>
           </widget>
          </item>
          <item row="8" column="0">
           <widget class="QLabel" name="label_15">
            <property name="text">
             <string>Num. previous directions:</string>
            </property>
           </widget>
          </item>
          <item row="8" column="1">
           <widget class="QSpinBox" name="m_NumPrevDirs">
            <property name="toolTip">
             <string>Number of previous fiber directions used as features.</string>
            </property>
            <property name="statusTip">
             <string/>
            </property>
            <property name="minimum">
             <number>0</number>
            </property>
            <property name="maximum">
             <number>50</number>
            </property>
            <property name="value">
             <number>1</number>
            </property>
           </widget>
          </item>
          <item row="0" column="0">
           <widget class="QLabel" name="label_7">
            <property name="text">
             <string>dMRI Features:</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QComboBox" name="m_FeatureTypeBox">
            <item>
             <property name="text">
              <string>Spherical Harmonics Coefficients</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Raw Data</string>
             </property>
            </item>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QCommandLinkButton" name="m_StartTrainingButton">
      <property name="toolTip">
       <string>Start Training. This can take up to a couple of hours.</string>
      </property>
      <property name="text">
       <string>Start Training</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <resources>
   <include location="../../../org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp
index 4c7742eddc..77dddc91a1 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp
@@ -1,904 +1,910 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIStructuredSelection.h>
 
 // Qmitk
 #include "QmitkStreamlineTrackingView.h"
 #include "QmitkStdMultiWidget.h"
 
 // Qt
 #include <QMessageBox>
 
 // MITK
 #include <mitkLookupTable.h>
 #include <mitkLookupTableProperty.h>
 #include <mitkImageToItk.h>
 #include <mitkFiberBundle.h>
 #include <mitkImageCast.h>
 #include <mitkNodePredicateDataType.h>
 #include <mitkNodePredicateNot.h>
 #include <mitkNodePredicateAnd.h>
 #include <mitkNodePredicateProperty.h>
 #include <mitkNodePredicateDimension.h>
 #include <mitkOdfImage.h>
 #include <mitkSliceNavigationController.h>
 
 // VTK
 #include <vtkRenderWindowInteractor.h>
 #include <vtkPolyData.h>
 #include <vtkPoints.h>
 #include <vtkCellArray.h>
 #include <vtkSmartPointer.h>
 #include <vtkPolyLine.h>
 #include <vtkCellData.h>
 
 #include <itkTensorImageToOdfImageFilter.h>
 #include <omp.h>
 
 const std::string QmitkStreamlineTrackingView::VIEW_ID = "org.mitk.views.streamlinetracking";
 const std::string id_DataManager = "org.mitk.views.datamanager";
 using namespace berry;
 
 QmitkStreamlineTrackingWorker::QmitkStreamlineTrackingWorker(QmitkStreamlineTrackingView* view)
     : m_View(view)
 {
 }
 
 void QmitkStreamlineTrackingWorker::run()
 {
     m_View->m_Tracker->Update();
     m_View->m_TrackingThread.quit();
 }
 
 QmitkStreamlineTrackingView::QmitkStreamlineTrackingView()
   : m_TrackingWorker(this)
   , m_Controls(nullptr)
   , m_FirstTensorProbRun(true)
   , m_FirstInteractiveRun(true)
   , m_TrackingHandler(nullptr)
   , m_ThreadIsRunning(false)
   , m_DeleteTrackingHandler(false)
 {
   m_TrackingWorker.moveToThread(&m_TrackingThread);
   connect(&m_TrackingThread, SIGNAL(started()), this, SLOT(BeforeThread()));
   connect(&m_TrackingThread, SIGNAL(started()), &m_TrackingWorker, SLOT(run()));
   connect(&m_TrackingThread, SIGNAL(finished()), this, SLOT(AfterThread()));
   m_TrackingTimer = new QTimer(this);
 }
 
 // Destructor
 QmitkStreamlineTrackingView::~QmitkStreamlineTrackingView()
 {
   if (m_Tracker.IsNull())
     return;
 
   m_Tracker->SetStopTracking(true);
   m_TrackingThread.wait();
 }
 
 void QmitkStreamlineTrackingView::CreateQtPartControl( QWidget *parent )
 {
   if ( !m_Controls )
   {
     // create GUI widgets from the Qt Designer's .ui file
     m_Controls = new Ui::QmitkStreamlineTrackingViewControls;
     m_Controls->setupUi( parent );
     m_Controls->m_FaImageBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_SeedImageBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_MaskImageBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_TargetImageBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_StopImageBox->SetDataStorage(this->GetDataStorage());
     m_Controls->m_ForestBox->SetDataStorage(this->GetDataStorage());
 
     mitk::TNodePredicateDataType<mitk::Image>::Pointer isImagePredicate = mitk::TNodePredicateDataType<mitk::Image>::New();
     mitk::TNodePredicateDataType<mitk::TractographyForest>::Pointer isTractographyForest = mitk::TNodePredicateDataType<mitk::TractographyForest>::New();
 
     mitk::NodePredicateProperty::Pointer isBinaryPredicate = mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true));
     mitk::NodePredicateNot::Pointer isNotBinaryPredicate = mitk::NodePredicateNot::New( isBinaryPredicate );
     mitk::NodePredicateAnd::Pointer isNotABinaryImagePredicate = mitk::NodePredicateAnd::New( isImagePredicate, isNotBinaryPredicate );
     mitk::NodePredicateDimension::Pointer dimensionPredicate = mitk::NodePredicateDimension::New(3);
 
     m_Controls->m_ForestBox->SetPredicate(isTractographyForest);
     m_Controls->m_FaImageBox->SetPredicate( mitk::NodePredicateAnd::New(isNotABinaryImagePredicate, dimensionPredicate) );
     m_Controls->m_FaImageBox->SetZeroEntryText("--");
     m_Controls->m_SeedImageBox->SetPredicate( mitk::NodePredicateAnd::New(isImagePredicate, dimensionPredicate) );
     m_Controls->m_SeedImageBox->SetZeroEntryText("--");
     m_Controls->m_MaskImageBox->SetPredicate( mitk::NodePredicateAnd::New(isImagePredicate, dimensionPredicate) );
     m_Controls->m_MaskImageBox->SetZeroEntryText("--");
     m_Controls->m_StopImageBox->SetPredicate( mitk::NodePredicateAnd::New(isImagePredicate, dimensionPredicate) );
     m_Controls->m_StopImageBox->SetZeroEntryText("--");
     m_Controls->m_TargetImageBox->SetPredicate( mitk::NodePredicateAnd::New(isImagePredicate, dimensionPredicate) );
     m_Controls->m_TargetImageBox->SetZeroEntryText("--");
 
     connect( m_TrackingTimer, SIGNAL(timeout()), this, SLOT(TimerUpdate()) );
     connect( m_Controls->commandLinkButton_2, SIGNAL(clicked()), this, SLOT(StopTractography()) );
     connect( m_Controls->commandLinkButton, SIGNAL(clicked()), this, SLOT(DoFiberTracking()) );
     connect( m_Controls->m_InteractiveBox, SIGNAL(stateChanged(int)), this, SLOT(ToggleInteractive()) );
     connect( m_Controls->m_ModeBox, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateGui()) );
     connect( m_Controls->m_FaImageBox, SIGNAL(currentIndexChanged(int)), this, SLOT(DeleteTrackingHandler()) );
     connect( m_Controls->m_ModeBox, SIGNAL(currentIndexChanged(int)), this, SLOT(DeleteTrackingHandler()) );
     connect( m_Controls->m_OutputProbMap, SIGNAL(stateChanged(int)), this, SLOT(OutputStyleSwitched()) );
 
     connect( m_Controls->m_SeedImageBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_ModeBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_StopImageBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_TargetImageBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_MaskImageBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_FaImageBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_ForestBox, SIGNAL(currentIndexChanged(int)), this, SLOT(ForestSwitched()) );
     connect( m_Controls->m_ForestBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_SeedsPerVoxelBox, SIGNAL(valueChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_NumFibersBox, SIGNAL(valueChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_ScalarThresholdBox, SIGNAL(valueChanged(double)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_OdfCutoffBox, SIGNAL(valueChanged(double)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_StepSizeBox, SIGNAL(valueChanged(double)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_SamplingDistanceBox, SIGNAL(valueChanged(double)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_AngularThresholdBox, SIGNAL(valueChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_MinTractLengthBox, SIGNAL(valueChanged(double)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_fBox, SIGNAL(valueChanged(double)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_gBox, SIGNAL(valueChanged(double)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_NumSamplesBox, SIGNAL(valueChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_SeedRadiusBox, SIGNAL(valueChanged(double)), this, SLOT(InteractiveSeedChanged()) );
     connect( m_Controls->m_NumSeedsBox, SIGNAL(valueChanged(int)), this, SLOT(InteractiveSeedChanged()) );
     connect( m_Controls->m_OutputProbMap, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_SharpenOdfsBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_InterpolationBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_MaskInterpolationBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_FlipXBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_FlipYBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_FlipZBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_FrontalSamplesBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_StopVotesBox, SIGNAL(stateChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_LoopCheckBox, SIGNAL(valueChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_TrialsPerSeedBox, SIGNAL(valueChanged(int)), this, SLOT(OnParameterChanged()) );
     connect( m_Controls->m_EpConstraintsBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnParameterChanged()) );
 
     StartStopTrackingGui(false);
   }
 
   UpdateGui();
 }
 
 void QmitkStreamlineTrackingView::StopTractography()
 {
   if (m_Tracker.IsNull())
     return;
 
   m_Tracker->SetStopTracking(true);
 }
 
 void QmitkStreamlineTrackingView::TimerUpdate()
 {
   if (m_Tracker.IsNull())
     return;
 
   QString status_text(m_Tracker->GetStatusText().c_str());
   m_Controls->m_StatusTextBox->setText(status_text);
 }
 
 void QmitkStreamlineTrackingView::BeforeThread()
 {
   m_TrackingTimer->start(1000);
 }
 
 void QmitkStreamlineTrackingView::AfterThread()
 {
   m_TrackingTimer->stop();
   if (!m_Tracker->GetUseOutputProbabilityMap())
   {
     vtkSmartPointer<vtkPolyData> fiberBundle = m_Tracker->GetFiberPolyData();
 
     if (!m_Controls->m_InteractiveBox->isChecked() && fiberBundle->GetNumberOfLines() == 0)
     {
       QMessageBox warnBox;
       warnBox.setWindowTitle("Warning");
       warnBox.setText("No fiberbundle was generated!");
       warnBox.setDetailedText("No fibers were generated using the chosen parameters. Typical reasons are:\n\n- Cutoff too high. Some images feature very low FA/GFA/peak size. Try to lower this parameter.\n- Angular threshold too strict. Try to increase this parameter.\n- A small step sizes also means many steps to go wrong. Especially in the case of probabilistic tractography. Try to adjust the angular threshold.");
       warnBox.setIcon(QMessageBox::Warning);
       warnBox.exec();
 
       if (m_InteractivePointSetNode.IsNotNull())
         m_InteractivePointSetNode->SetProperty("color", mitk::ColorProperty::New(1,1,1));
       StartStopTrackingGui(false);
       if (m_DeleteTrackingHandler)
         DeleteTrackingHandler();
       UpdateGui();
 
       return;
     }
 
     mitk::FiberBundle::Pointer fib = mitk::FiberBundle::New(fiberBundle);
     fib->SetReferenceGeometry(dynamic_cast<mitk::Image*>(m_ParentNode->GetData())->GetGeometry());
     if (m_Controls->m_ResampleFibersBox->isChecked() && fiberBundle->GetNumberOfLines()>0)
       fib->Compress(m_Controls->m_FiberErrorBox->value());
     fib->ColorFibersByOrientation();
     m_Tracker->SetDicomProperties(fib);
 
     if (m_Controls->m_InteractiveBox->isChecked())
     {
       if (m_InteractiveNode.IsNull())
       {
         m_InteractiveNode = mitk::DataNode::New();
         QString name("Interactive");
         m_InteractiveNode->SetName(name.toStdString());
         GetDataStorage()->Add(m_InteractiveNode);
       }
       m_InteractiveNode->SetData(fib);
       m_InteractiveNode->SetFloatProperty("Fiber2DSliceThickness", m_Tracker->GetMinVoxelSize()/2);
 
       if (auto renderWindowPart = this->GetRenderWindowPart())
           renderWindowPart->RequestUpdate();
     }
     else
     {
       mitk::DataNode::Pointer node = mitk::DataNode::New();
       node->SetData(fib);
       QString name("FiberBundle_");
       name += m_ParentNode->GetName().c_str();
       name += "_Streamline";
       node->SetName(name.toStdString());
       node->SetFloatProperty("Fiber2DSliceThickness", m_Tracker->GetMinVoxelSize()/2);
       GetDataStorage()->Add(node, m_ParentNode);
     }
   }
   else
   {
     TrackerType::ItkDoubleImgType::Pointer outImg = m_Tracker->GetOutputProbabilityMap();
     mitk::Image::Pointer img = mitk::Image::New();
     img->InitializeByItk(outImg.GetPointer());
     img->SetVolume(outImg->GetBufferPointer());
 
     if (m_Controls->m_InteractiveBox->isChecked())
     {
       if (m_InteractiveNode.IsNull())
       {
         m_InteractiveNode = mitk::DataNode::New();
         QString name("Interactive");
         m_InteractiveNode->SetName(name.toStdString());
         GetDataStorage()->Add(m_InteractiveNode);
       }
       m_InteractiveNode->SetData(img);
 
       mitk::LookupTable::Pointer lut = mitk::LookupTable::New();
       lut->SetType(mitk::LookupTable::JET_TRANSPARENT);
       mitk::LookupTableProperty::Pointer lut_prop = mitk::LookupTableProperty::New();
       lut_prop->SetLookupTable(lut);
       m_InteractiveNode->SetProperty("LookupTable", lut_prop);
       m_InteractiveNode->SetProperty("opacity", mitk::FloatProperty::New(0.5));
       m_InteractiveNode->SetFloatProperty("Fiber2DSliceThickness", m_Tracker->GetMinVoxelSize()/2);
 
       if (auto renderWindowPart = this->GetRenderWindowPart())
           renderWindowPart->RequestUpdate();
     }
     else
     {
       mitk::DataNode::Pointer node = mitk::DataNode::New();
       node->SetData(img);
       QString name("ProbabilityMap_");
       name += m_ParentNode->GetName().c_str();
       node->SetName(name.toStdString());
 
       mitk::LookupTable::Pointer lut = mitk::LookupTable::New();
       lut->SetType(mitk::LookupTable::JET_TRANSPARENT);
       mitk::LookupTableProperty::Pointer lut_prop = mitk::LookupTableProperty::New();
       lut_prop->SetLookupTable(lut);
       node->SetProperty("LookupTable", lut_prop);
       node->SetProperty("opacity", mitk::FloatProperty::New(0.5));
 
       GetDataStorage()->Add(node, m_ParentNode);
     }
   }
   if (m_InteractivePointSetNode.IsNotNull())
     m_InteractivePointSetNode->SetProperty("color", mitk::ColorProperty::New(1,1,1));
   StartStopTrackingGui(false);
   if (m_DeleteTrackingHandler)
     DeleteTrackingHandler();
   UpdateGui();
 }
 
 void QmitkStreamlineTrackingView::InteractiveSeedChanged(bool posChanged)
 {
   if (m_ThreadIsRunning)
     return;
   if (!posChanged && (!m_Controls->m_InteractiveBox->isChecked() || !m_Controls->m_ParamUpdateBox->isChecked()))
     return;
 
   std::srand(std::time(0));
   m_SeedPoints.clear();
 
   itk::Point<float> world_pos = this->GetRenderWindowPart()->GetSelectedPosition();
 
   m_SeedPoints.push_back(world_pos);
   float radius = m_Controls->m_SeedRadiusBox->value();
   int num = m_Controls->m_NumSeedsBox->value();
 
   mitk::PointSet::Pointer pointset = mitk::PointSet::New();
   pointset->InsertPoint(0, world_pos);
   m_InteractivePointSetNode->SetProperty("pointsize", mitk::FloatProperty::New(radius*2));
   m_InteractivePointSetNode->SetProperty("point 2D size", mitk::FloatProperty::New(radius*2));
   m_InteractivePointSetNode->SetData(pointset);
 
   for (int i=1; i<num; i++)
   {
     itk::Vector<float> p;
     p[0] = rand()%1000-500;
     p[1] = rand()%1000-500;
     p[2] = rand()%1000-500;
     p.Normalize();
     p *= radius;
     m_SeedPoints.push_back(world_pos+p);
   }
   m_InteractivePointSetNode->SetProperty("color", mitk::ColorProperty::New(1,0,0));
   DoFiberTracking();
 }
 
 void QmitkStreamlineTrackingView::OnParameterChanged()
 {
   UpdateGui();
   if (m_Controls->m_InteractiveBox->isChecked() && m_Controls->m_ParamUpdateBox->isChecked())
     DoFiberTracking();
 }
 
 void QmitkStreamlineTrackingView::ToggleInteractive()
 {
   UpdateGui();
 
   m_Controls->m_SeedsPerVoxelBox->setEnabled(!m_Controls->m_InteractiveBox->isChecked());
   m_Controls->m_SeedsPerVoxelLabel->setEnabled(!m_Controls->m_InteractiveBox->isChecked());
   m_Controls->m_SeedImageBox->setEnabled(!m_Controls->m_InteractiveBox->isChecked());
   m_Controls->label_6->setEnabled(!m_Controls->m_InteractiveBox->isChecked());
 
   if ( m_Controls->m_InteractiveBox->isChecked() )
   {
-    if (m_FirstInteractiveRun)
-    {
-      QMessageBox::information(nullptr, "Information", "Place and move a spherical seed region anywhere in the image by left-clicking and dragging. If the seed region is colored red, tracking is in progress. If the seed region is colored white, tracking is finished.\nPlacing the seed region for the first time in a newly selected dataset might cause a short delay, since the tracker needs to be initialized.");
-      m_FirstInteractiveRun = false;
-    }
+//    if (m_FirstInteractiveRun)
+//    {
+//      QMessageBox::information(nullptr, "Information", "Place and move a spherical seed region anywhere in the image by left-clicking and dragging. If the seed region is colored red, tracking is in progress. If the seed region is colored white, tracking is finished.\nPlacing the seed region for the first time in a newly selected dataset might cause a short delay, since the tracker needs to be initialized.");
+//      m_FirstInteractiveRun = false;
+//    }
 
     QApplication::setOverrideCursor(Qt::PointingHandCursor);
     QApplication::processEvents();
 
     m_InteractivePointSetNode = mitk::DataNode::New();
     m_InteractivePointSetNode->SetProperty("color", mitk::ColorProperty::New(1,1,1));
     m_InteractivePointSetNode->SetName("InteractiveSeedRegion");
     mitk::PointSetShapeProperty::Pointer shape_prop = mitk::PointSetShapeProperty::New();
     shape_prop->SetValue(mitk::PointSetShapeProperty::PointSetShape::CIRCLE);
     m_InteractivePointSetNode->SetProperty("Pointset.2D.shape", shape_prop);
     GetDataStorage()->Add(m_InteractivePointSetNode);
 
 
     m_SliceChangeListener.RenderWindowPartActivated(this->GetRenderWindowPart());
     connect(&m_SliceChangeListener, SIGNAL(SliceChanged()), this, SLOT(OnSliceChanged()));
   }
   else
   {
     QApplication::restoreOverrideCursor();
     QApplication::processEvents();
 
     m_InteractiveNode = nullptr;
     m_InteractivePointSetNode = nullptr;
 
     m_SliceChangeListener.RenderWindowPartActivated(this->GetRenderWindowPart());
     disconnect(&m_SliceChangeListener, SIGNAL(SliceChanged()), this, SLOT(OnSliceChanged()));
   }
 }
 
 void QmitkStreamlineTrackingView::OnSliceChanged()
 {
   InteractiveSeedChanged(true);
 }
 
 void QmitkStreamlineTrackingView::SetFocus()
 {
 }
 
 void QmitkStreamlineTrackingView::DeleteTrackingHandler()
 {
   if (!m_ThreadIsRunning && m_TrackingHandler != nullptr)
   {
     delete m_TrackingHandler;
     m_TrackingHandler = nullptr;
     m_DeleteTrackingHandler = false;
   }
   else if (m_ThreadIsRunning)
   {
     m_DeleteTrackingHandler = true;
   }
 }
 
 void QmitkStreamlineTrackingView::ForestSwitched()
 {
   DeleteTrackingHandler();
 }
 
 void QmitkStreamlineTrackingView::OutputStyleSwitched()
 {
   if (m_InteractiveNode.IsNotNull())
     GetDataStorage()->Remove(m_InteractiveNode);
   m_InteractiveNode = nullptr;
 }
 
 void QmitkStreamlineTrackingView::OnSelectionChanged( berry::IWorkbenchPart::Pointer , const QList<mitk::DataNode::Pointer>& nodes )
 {
   std::vector< mitk::DataNode::Pointer > last_nodes = m_InputImageNodes;
   m_InputImageNodes.clear();
   m_InputImages.clear();
   m_AdditionalInputImages.clear();
   bool retrack = false;
 
   for( auto node : nodes )
   {
 
     if( node.IsNotNull() && dynamic_cast<mitk::Image*>(node->GetData()) )
     {
       if( dynamic_cast<mitk::TensorImage*>(node->GetData()) )
       {
         m_InputImageNodes.push_back(node);
         m_InputImages.push_back(dynamic_cast<mitk::Image*>(node->GetData()));
         retrack = true;
       }
       else if ( dynamic_cast<mitk::OdfImage*>(node->GetData()) )
       {
         m_InputImageNodes.push_back(node);
         m_InputImages.push_back(dynamic_cast<mitk::Image*>(node->GetData()));
         retrack = true;
       }
       else if ( mitk::DiffusionPropertyHelper::IsDiffusionWeightedImage( dynamic_cast<mitk::Image *>(node->GetData())) )
       {
         m_InputImageNodes.push_back(node);
         m_InputImages.push_back(dynamic_cast<mitk::Image*>(node->GetData()));
         retrack = true;
       }
       else
       {
         mitk::Image* img = dynamic_cast<mitk::Image*>(node->GetData());
         if (img!=nullptr)
         {
           int dim = img->GetDimension();
           unsigned int* dimensions = img->GetDimensions();
           if (dim==4 && dimensions[3]%3==0)
           {
             m_InputImageNodes.push_back(node);
             m_InputImages.push_back(dynamic_cast<mitk::Image*>(node->GetData()));
             retrack = true;
           }
           else if (dim==3)
           {
             m_AdditionalInputImages.push_back(dynamic_cast<mitk::Image*>(node->GetData()));
           }
         }
       }
     }
   }
 
   // sometimes the OnSelectionChanged event is sent twice and actually no selection has changed for the first event. We need to catch that.
   if (last_nodes.size() == m_InputImageNodes.size())
   {
     bool same_nodes = true;
     for (unsigned int i=0; i<m_InputImageNodes.size(); i++)
       if (last_nodes.at(i)!=m_InputImageNodes.at(i))
       {
         same_nodes = false;
         break;
       }
     if (same_nodes)
       return;
   }
 
   DeleteTrackingHandler();
   UpdateGui();
   if (retrack)
     OnParameterChanged();
 }
 
 void QmitkStreamlineTrackingView::UpdateGui()
 {
-  m_Controls->m_TensorImageLabel->setText("<font color='red'>mandatory</font>");
+  m_Controls->m_TensorImageLabel->setText("<font color='red'>select in data-manager</font>");
 
   m_Controls->m_fBox->setEnabled(false);
   m_Controls->m_fLabel->setEnabled(false);
   m_Controls->m_gBox->setEnabled(false);
   m_Controls->m_gLabel->setEnabled(false);
-  m_Controls->m_FaImageBox->setEnabled(false);
-  m_Controls->mFaImageLabel->setEnabled(false);
+  m_Controls->m_FaImageBox->setEnabled(true);
+  m_Controls->mFaImageLabel->setEnabled(true);
   m_Controls->m_OdfCutoffBox->setEnabled(false);
   m_Controls->m_OdfCutoffLabel->setEnabled(false);
   m_Controls->m_SharpenOdfsBox->setEnabled(false);
-  m_Controls->m_ForestBox->setEnabled(false);
-  m_Controls->m_ForestLabel->setEnabled(false);
+  m_Controls->m_ForestBox->setVisible(false);
+  m_Controls->m_ForestLabel->setVisible(false);
   m_Controls->commandLinkButton->setEnabled(false);
   m_Controls->m_TrialsPerSeedBox->setEnabled(false);
   m_Controls->m_TrialsPerSeedLabel->setEnabled(false);
-  m_Controls->m_TargetImageBox->setEnabled(false);
-  m_Controls->m_TargetImageLabel->setEnabled(false);
+  m_Controls->m_TargetImageBox->setVisible(false);
+  m_Controls->m_TargetImageLabel->setVisible(false);
+
+  if (m_Controls->m_InteractiveBox->isChecked())
+  {
+    m_Controls->m_InteractiveSeedingFrame->setVisible(true);
+    m_Controls->m_StaticSeedingFrame->setVisible(false);
+    m_Controls->commandLinkButton_2->setVisible(false);
+    m_Controls->commandLinkButton->setVisible(false);
+  }
+  else
+  {
+    m_Controls->m_InteractiveSeedingFrame->setVisible(false);
+    m_Controls->m_StaticSeedingFrame->setVisible(true);
+    m_Controls->commandLinkButton_2->setVisible(m_ThreadIsRunning);
+    m_Controls->commandLinkButton->setVisible(!m_ThreadIsRunning);
+  }
 
   if (m_Controls->m_EpConstraintsBox->currentIndex()>0)
   {
-    m_Controls->m_TargetImageBox->setEnabled(true);
-    m_Controls->m_TargetImageLabel->setEnabled(true);
+    m_Controls->m_TargetImageBox->setVisible(true);
+    m_Controls->m_TargetImageLabel->setVisible(true);
   }
 
   // trials per seed are only important for probabilistic tractography
   if (m_Controls->m_ModeBox->currentIndex()==1)
   {
     m_Controls->m_TrialsPerSeedBox->setEnabled(true);
     m_Controls->m_TrialsPerSeedLabel->setEnabled(true);
   }
 
   if(!m_InputImageNodes.empty())
   {
     if (m_InputImageNodes.size()>1)
       m_Controls->m_TensorImageLabel->setText( ( std::to_string(m_InputImageNodes.size()) + " images selected").c_str() );
     else
       m_Controls->m_TensorImageLabel->setText(m_InputImageNodes.at(0)->GetName().c_str());
-    m_Controls->m_InputData->setTitle("Input Data");
     m_Controls->commandLinkButton->setEnabled(!m_Controls->m_InteractiveBox->isChecked() && !m_ThreadIsRunning);
 
     m_Controls->m_ScalarThresholdBox->setEnabled(true);
     m_Controls->m_FaThresholdLabel->setEnabled(true);
 
     if ( dynamic_cast<mitk::TensorImage*>(m_InputImageNodes.at(0)->GetData()) )
     {
       m_Controls->m_fBox->setEnabled(true);
       m_Controls->m_fLabel->setEnabled(true);
       m_Controls->m_gBox->setEnabled(true);
       m_Controls->m_gLabel->setEnabled(true);
-      m_Controls->mFaImageLabel->setEnabled(true);
-      m_Controls->m_FaImageBox->setEnabled(true);
     }
     else if ( dynamic_cast<mitk::OdfImage*>(m_InputImageNodes.at(0)->GetData()) )
     {
-      m_Controls->mFaImageLabel->setEnabled(true);
-      m_Controls->m_FaImageBox->setEnabled(true);
-
       m_Controls->m_OdfCutoffBox->setEnabled(true);
       m_Controls->m_OdfCutoffLabel->setEnabled(true);
       m_Controls->m_SharpenOdfsBox->setEnabled(true);
     }
     else if (  mitk::DiffusionPropertyHelper::IsDiffusionWeightedImage( dynamic_cast<mitk::Image *>(m_InputImageNodes.at(0)->GetData())) )
     {
-      m_Controls->m_ForestBox->setEnabled(true);
-      m_Controls->m_ForestLabel->setEnabled(true);
+      m_Controls->m_ForestBox->setVisible(true);
+      m_Controls->m_ForestLabel->setVisible(true);
       m_Controls->m_ScalarThresholdBox->setEnabled(false);
       m_Controls->m_FaThresholdLabel->setEnabled(false);
     }
   }
-  else
-    m_Controls->m_InputData->setTitle("Please Select Input Data");
-
 }
 
 void QmitkStreamlineTrackingView::StartStopTrackingGui(bool start)
 {
   m_ThreadIsRunning = start;
 
   if (!m_Controls->m_InteractiveBox->isChecked())
   {
     m_Controls->commandLinkButton_2->setVisible(start);
     m_Controls->commandLinkButton->setVisible(!start);
     m_Controls->m_InteractiveBox->setEnabled(!start);
     m_Controls->m_StatusTextBox->setVisible(start);
   }
 }
 
 void QmitkStreamlineTrackingView::DoFiberTracking()
 {
   if (m_ThreadIsRunning)
     return;
   if (m_InputImages.empty())
     return;
   if (m_Controls->m_InteractiveBox->isChecked() && m_SeedPoints.empty())
     return;
   StartStopTrackingGui(true);
 
   m_Tracker = TrackerType::New();
 
   if( dynamic_cast<mitk::TensorImage*>(m_InputImageNodes.at(0)->GetData()) )
   {
     typedef mitk::ImageToItk<mitk::TensorImage::ItkTensorImageType> CasterType;
 
     if (m_Controls->m_ModeBox->currentIndex()==1)
     {
       if (m_InputImages.size()>1)
       {
         QMessageBox::information(nullptr, "Information", "Probabilistic tensor tractography is only implemented for single-tensor mode!");
         StartStopTrackingGui(false);
         return;
       }
 
-      if (m_FirstTensorProbRun)
-      {
-        QMessageBox::information(nullptr, "Information", "Internally calculating ODF from tensor image and performing probabilistic ODF tractography. ODFs are sharpened (min-max normalized and raised to the power of 4). TEND parameters are ignored.");
-        m_FirstTensorProbRun = false;
-      }
+//      if (m_FirstTensorProbRun)
+//      {
+//        QMessageBox::information(nullptr, "Information", "Internally calculating ODF from tensor image and performing probabilistic ODF tractography. ODFs are sharpened (min-max normalized and raised to the power of 4). TEND parameters are ignored.");
+//        m_FirstTensorProbRun = false;
+//      }
 
       if (m_TrackingHandler==nullptr)
       {
         typedef mitk::ImageToItk< mitk::TrackingHandlerOdf::ItkOdfImageType > CasterType;
         m_TrackingHandler = new mitk::TrackingHandlerOdf();
         mitk::TensorImage::ItkTensorImageType::Pointer itkImg = mitk::TensorImage::ItkTensorImageType::New();
         mitk::CastToItkImage(m_InputImages.at(0), itkImg);
 
         typedef itk::TensorImageToOdfImageFilter< float, float > FilterType;
         FilterType::Pointer filter = FilterType::New();
         filter->SetInput( itkImg );
         filter->Update();
         dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetOdfImage(filter->GetOutput());
 
         if (m_Controls->m_FaImageBox->GetSelectedNode().IsNotNull())
         {
           ItkFloatImageType::Pointer itkImg = ItkFloatImageType::New();
           mitk::CastToItkImage(dynamic_cast<mitk::Image*>(m_Controls->m_FaImageBox->GetSelectedNode()->GetData()), itkImg);
 
           dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetGfaImage(itkImg);
         }
       }
 
       dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetGfaThreshold(m_Controls->m_ScalarThresholdBox->value());
       dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetOdfThreshold(0);
       dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetSharpenOdfs(true);
       dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetIsOdfFromTensor(true);
     }
     else
     {
       if (m_TrackingHandler==nullptr)
       {
         m_TrackingHandler = new mitk::TrackingHandlerTensor();
         for (int i=0; i<(int)m_InputImages.size(); i++)
         {
           typedef mitk::ImageToItk< mitk::TrackingHandlerTensor::ItkTensorImageType > CasterType;
           CasterType::Pointer caster = CasterType::New();
           caster->SetInput(m_InputImages.at(i));
           caster->Update();
           mitk::TrackingHandlerTensor::ItkTensorImageType::ConstPointer itkImg = caster->GetOutput();
 
           dynamic_cast<mitk::TrackingHandlerTensor*>(m_TrackingHandler)->AddTensorImage(itkImg);
         }
 
         if (m_Controls->m_FaImageBox->GetSelectedNode().IsNotNull())
         {
           ItkFloatImageType::Pointer itkImg = ItkFloatImageType::New();
           mitk::CastToItkImage(dynamic_cast<mitk::Image*>(m_Controls->m_FaImageBox->GetSelectedNode()->GetData()), itkImg);
 
           dynamic_cast<mitk::TrackingHandlerTensor*>(m_TrackingHandler)->SetFaImage(itkImg);
         }
       }
 
       dynamic_cast<mitk::TrackingHandlerTensor*>(m_TrackingHandler)->SetFaThreshold(m_Controls->m_ScalarThresholdBox->value());
       dynamic_cast<mitk::TrackingHandlerTensor*>(m_TrackingHandler)->SetF((float)m_Controls->m_fBox->value());
       dynamic_cast<mitk::TrackingHandlerTensor*>(m_TrackingHandler)->SetG((float)m_Controls->m_gBox->value());
     }
   }
   else if ( dynamic_cast<mitk::OdfImage*>(m_InputImageNodes.at(0)->GetData()) )
   {
     if (m_TrackingHandler==nullptr)
     {
       typedef mitk::ImageToItk< mitk::TrackingHandlerOdf::ItkOdfImageType > CasterType;
       m_TrackingHandler = new mitk::TrackingHandlerOdf();
       mitk::TrackingHandlerOdf::ItkOdfImageType::Pointer itkImg = mitk::TrackingHandlerOdf::ItkOdfImageType::New();
       mitk::CastToItkImage(m_InputImages.at(0), itkImg);
       dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetOdfImage(itkImg);
 
       if (m_Controls->m_FaImageBox->GetSelectedNode().IsNotNull())
       {
         ItkFloatImageType::Pointer itkImg = ItkFloatImageType::New();
         mitk::CastToItkImage(dynamic_cast<mitk::Image*>(m_Controls->m_FaImageBox->GetSelectedNode()->GetData()), itkImg);
         dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetGfaImage(itkImg);
       }
     }
 
     dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetGfaThreshold(m_Controls->m_ScalarThresholdBox->value());
     dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetOdfThreshold(m_Controls->m_OdfCutoffBox->value());
     dynamic_cast<mitk::TrackingHandlerOdf*>(m_TrackingHandler)->SetSharpenOdfs(m_Controls->m_SharpenOdfsBox->isChecked());
   }
   else if ( mitk::DiffusionPropertyHelper::IsDiffusionWeightedImage( dynamic_cast<mitk::Image*>(m_InputImageNodes.at(0)->GetData())) )
   {
     if ( m_Controls->m_ForestBox->GetSelectedNode().IsNull() )
     {
       QMessageBox::information(nullptr, "Information", "Not random forest for machine learning based tractography (raw dMRI tractography) selected. Did you accidentally select the raw diffusion-weighted image in the datamanager?");
       StartStopTrackingGui(false);
       return;
     }
 
     if (m_TrackingHandler==nullptr)
     {
       mitk::TractographyForest::Pointer forest = dynamic_cast<mitk::TractographyForest*>(m_Controls->m_ForestBox->GetSelectedNode()->GetData());
       mitk::Image::Pointer dwi = dynamic_cast<mitk::Image*>(m_InputImageNodes.at(0)->GetData());
 
       std::vector< std::vector< ItkFloatImageType::Pointer > > additionalFeatureImages;
       additionalFeatureImages.push_back(std::vector< ItkFloatImageType::Pointer >());
       for (auto img : m_AdditionalInputImages)
       {
         ItkFloatImageType::Pointer itkimg = ItkFloatImageType::New();
         mitk::CastToItkImage(img, itkimg);
         additionalFeatureImages.at(0).push_back(itkimg);
       }
 
       bool forest_valid = false;
       if (forest->GetNumFeatures()>=100)
       {
         int num_previous_directions = (forest->GetNumFeatures() - (100 + additionalFeatureImages.at(0).size()))/3;
         m_TrackingHandler = new mitk::TrackingHandlerRandomForest<6, 100>();
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 100>*>(m_TrackingHandler)->AddDwi(dwi);
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 100>*>(m_TrackingHandler)->SetAdditionalFeatureImages(additionalFeatureImages);
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 100>*>(m_TrackingHandler)->SetForest(forest);
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 100>*>(m_TrackingHandler)->SetNumPreviousDirections(num_previous_directions);
         forest_valid = dynamic_cast<mitk::TrackingHandlerRandomForest<6, 100>*>(m_TrackingHandler)->IsForestValid();
       }
       else
       {
         int num_previous_directions = (forest->GetNumFeatures() - (28 + additionalFeatureImages.at(0).size()))/3;
         m_TrackingHandler = new mitk::TrackingHandlerRandomForest<6, 28>();
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 28>*>(m_TrackingHandler)->AddDwi(dwi);
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 28>*>(m_TrackingHandler)->SetAdditionalFeatureImages(additionalFeatureImages);
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 28>*>(m_TrackingHandler)->SetForest(forest);
         dynamic_cast<mitk::TrackingHandlerRandomForest<6, 28>*>(m_TrackingHandler)->SetNumPreviousDirections(num_previous_directions);
         forest_valid = dynamic_cast<mitk::TrackingHandlerRandomForest<6, 28>*>(m_TrackingHandler)->IsForestValid();
       }
 
       if (!forest_valid)
       {
         QMessageBox::information(nullptr, "Information", "Random forest is invalid. The forest signatue does not match the parameters of TrackingHandlerRandomForest.");
         StartStopTrackingGui(false);
         return;
       }
     }
   }
   else
   {
     if (m_Controls->m_ModeBox->currentIndex()==1)
     {
       QMessageBox::information(nullptr, "Information", "Probabilstic tractography is not implemented for peak images.");
       StartStopTrackingGui(false);
       return;
     }
     try {
 
       if (m_TrackingHandler==nullptr)
       {
         typedef mitk::ImageToItk< mitk::TrackingHandlerPeaks::PeakImgType > CasterType;
         CasterType::Pointer caster = CasterType::New();
         caster->SetInput(m_InputImages.at(0));
         caster->Update();
         mitk::TrackingHandlerPeaks::PeakImgType::Pointer itkImg = caster->GetOutput();
         m_TrackingHandler = new mitk::TrackingHandlerPeaks();
         dynamic_cast<mitk::TrackingHandlerPeaks*>(m_TrackingHandler)->SetPeakImage(itkImg);
       }
 
       dynamic_cast<mitk::TrackingHandlerPeaks*>(m_TrackingHandler)->SetPeakThreshold(m_Controls->m_ScalarThresholdBox->value());
     }
     catch(...)
     {
       QMessageBox::information(nullptr, "Error", "Peak tracker could not be initialized. Is your input image in the correct format (4D float image, peaks in the 4th dimension)?");
       StartStopTrackingGui(false);
       return;
     }
   }
 
   m_TrackingHandler->SetFlipX(m_Controls->m_FlipXBox->isChecked());
   m_TrackingHandler->SetFlipY(m_Controls->m_FlipYBox->isChecked());
   m_TrackingHandler->SetFlipZ(m_Controls->m_FlipZBox->isChecked());
   m_TrackingHandler->SetInterpolate(m_Controls->m_InterpolationBox->isChecked());
   switch (m_Controls->m_ModeBox->currentIndex())
   {
   case 0:
     m_TrackingHandler->SetMode(mitk::TrackingDataHandler::MODE::DETERMINISTIC);
     break;
   case 1:
     m_TrackingHandler->SetMode(mitk::TrackingDataHandler::MODE::PROBABILISTIC);
     break;
   default:
     m_TrackingHandler->SetMode(mitk::TrackingDataHandler::MODE::DETERMINISTIC);
   }
 
   if (m_Controls->m_InteractiveBox->isChecked())
   {
     m_Tracker->SetSeedPoints(m_SeedPoints);
   }
   else if (m_Controls->m_SeedImageBox->GetSelectedNode().IsNotNull())
   {
     ItkFloatImageType::Pointer mask = ItkFloatImageType::New();
     mitk::CastToItkImage(dynamic_cast<mitk::Image*>(m_Controls->m_SeedImageBox->GetSelectedNode()->GetData()), mask);
     m_Tracker->SetSeedImage(mask);
   }
 
   if (m_Controls->m_MaskImageBox->GetSelectedNode().IsNotNull())
   {
     ItkFloatImageType::Pointer mask = ItkFloatImageType::New();
     mitk::CastToItkImage(dynamic_cast<mitk::Image*>(m_Controls->m_MaskImageBox->GetSelectedNode()->GetData()), mask);
     m_Tracker->SetMaskImage(mask);
   }
 
   if (m_Controls->m_StopImageBox->GetSelectedNode().IsNotNull())
   {
     ItkFloatImageType::Pointer mask = ItkFloatImageType::New();
     mitk::CastToItkImage(dynamic_cast<mitk::Image*>(m_Controls->m_StopImageBox->GetSelectedNode()->GetData()), mask);
     m_Tracker->SetStoppingRegions(mask);
   }
 
   if (m_Controls->m_TargetImageBox->GetSelectedNode().IsNotNull())
   {
     ItkFloatImageType::Pointer mask = ItkFloatImageType::New();
     mitk::CastToItkImage(dynamic_cast<mitk::Image*>(m_Controls->m_TargetImageBox->GetSelectedNode()->GetData()), mask);
     m_Tracker->SetTargetRegions(mask);
   }
 
   // Endpoint constraints
   switch (m_Controls->m_EpConstraintsBox->currentIndex())
   {
   case 0:
     m_Tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::NONE);
     m_Tracker->SetTargetRegions(nullptr);
     break;
   case 1:
     m_Tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::EPS_IN_TARGET);
     break;
   case 2:
     m_Tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::EPS_IN_TARGET_LABELDIFF);
     break;
   case 3:
     m_Tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::EPS_IN_SEED_AND_TARGET);
     break;
   case 4:
     m_Tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::MIN_ONE_EP_IN_TARGET);
     break;
   case 5:
     m_Tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::ONE_EP_IN_TARGET);
     break;
   case 6:
     m_Tracker->SetEndpointConstraint(itk::StreamlineTrackingFilter::EndpointConstraints::NO_EP_IN_TARGET);
     break;
   }
 
   if (m_Tracker->GetEndpointConstraint()!=itk::StreamlineTrackingFilter::EndpointConstraints::NONE && m_Controls->m_TargetImageBox->GetSelectedNode().IsNull())
   {
     QMessageBox::information(nullptr, "Error", "Endpoint constraints are used but no target image is set!");
     StartStopTrackingGui(false);
     return;
   }
   else if (m_Tracker->GetEndpointConstraint()==itk::StreamlineTrackingFilter::EndpointConstraints::EPS_IN_SEED_AND_TARGET
            && (m_Controls->m_SeedImageBox->GetSelectedNode().IsNull()|| m_Controls->m_TargetImageBox->GetSelectedNode().IsNull()) )
   {
     QMessageBox::information(nullptr, "Error", "Endpoint constraint EPS_IN_SEED_AND_TARGET is used but no target or no seed image is set!");
     StartStopTrackingGui(false);
     return;
   }
 
   m_Tracker->SetInterpolateMasks(m_Controls->m_MaskInterpolationBox->isChecked());
   m_Tracker->SetVerbose(!m_Controls->m_InteractiveBox->isChecked());
   m_Tracker->SetSeedsPerVoxel(m_Controls->m_SeedsPerVoxelBox->value());
   m_Tracker->SetStepSize(m_Controls->m_StepSizeBox->value());
   m_Tracker->SetSamplingDistance(m_Controls->m_SamplingDistanceBox->value());
   m_Tracker->SetUseStopVotes(m_Controls->m_StopVotesBox->isChecked());
   m_Tracker->SetOnlyForwardSamples(m_Controls->m_FrontalSamplesBox->isChecked());
   m_Tracker->SetTrialsPerSeed(m_Controls->m_TrialsPerSeedBox->value());
   m_Tracker->SetMaxNumTracts(m_Controls->m_NumFibersBox->value());
   m_Tracker->SetNumberOfSamples(m_Controls->m_NumSamplesBox->value());
   m_Tracker->SetTrackingHandler(m_TrackingHandler);
   m_Tracker->SetLoopCheck(m_Controls->m_LoopCheckBox->value());
   m_Tracker->SetAngularThreshold(m_Controls->m_AngularThresholdBox->value());
   m_Tracker->SetMinTractLength(m_Controls->m_MinTractLengthBox->value());
   m_Tracker->SetUseOutputProbabilityMap(m_Controls->m_OutputProbMap->isChecked());
 
   m_ParentNode = m_InputImageNodes.at(0);
   m_TrackingThread.start(QThread::LowestPriority);
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui
index bca8658d44..b608549608 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui
@@ -1,1244 +1,1398 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkStreamlineTrackingViewControls</class>
  <widget class="QWidget" name="QmitkStreamlineTrackingViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>413</width>
-    <height>1385</height>
+    <width>453</width>
+    <height>859</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
-   <property name="horizontalSpacing">
-    <number>0</number>
-   </property>
-   <property name="verticalSpacing">
-    <number>0</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout_11">
    <property name="topMargin">
     <number>3</number>
    </property>
    <property name="bottomMargin">
     <number>3</number>
    </property>
-   <item row="0" column="0" colspan="2">
-    <widget class="QGroupBox" name="m_InputData">
-     <property name="title">
-      <string>Please Select Input Data</string>
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>40</number>
+   </property>
+   <item row="1" column="0">
+    <widget class="QFrame" name="frame_6">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_12">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>15</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="toolTip">
-         <string>Input Image. ODF, tensor and peak images are currently supported.</string>
-        </property>
-        <property name="text">
-         <string>Input Image:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1">
-       <widget class="QmitkDataStorageComboBox" name="m_ForestBox">
-        <property name="toolTip">
-         <string>Random forest for machine learning based tractography.</string>
-        </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-        </property>
-        <item>
-         <property name="text">
-          <string>-</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="mFaImageLabel">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>FA/GFA Image:</string>
-        </property>
-       </widget>
-      </item>
+      <property name="horizontalSpacing">
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>15</number>
+      </property>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Seed Image:</string>
+       <widget class="QTextEdit" name="m_StatusTextBox">
+        <property name="enabled">
+         <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_SeedImageBox">
-        <property name="toolTip">
-         <string>Seed points are only placed inside the mask image. If no seed mask is selected, the whole image is seeded.</string>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+        <property name="readOnly">
+         <bool>true</bool>
         </property>
-        <item>
-         <property name="text">
-          <string>-</string>
-         </property>
-        </item>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_StopImageBox">
-        <property name="toolTip">
-         <string>Fibers that enter a region defined in this image will stop immediately.</string>
+      <item row="0" column="0">
+       <widget class="QFrame" name="frame_9">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
         </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
         </property>
-        <item>
-         <property name="text">
-          <string>-</string>
+        <layout class="QGridLayout" name="gridLayout_19">
+         <property name="leftMargin">
+          <number>0</number>
          </property>
-        </item>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_TargetImageBox">
-        <property name="toolTip">
-         <string>Fibers that do not start and end in a region defined in this image or the seed image will be discarded.</string>
-        </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-        </property>
-        <item>
-         <property name="text">
-          <string>-</string>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
          </property>
-        </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="toolTip">
+            <string>Input Image. ODF, tensor and peak images are currently supported.</string>
+           </property>
+           <property name="text">
+            <string>Input Image:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLabel" name="m_TensorImageLabel">
+           <property name="toolTip">
+            <string>Input Image. ODF, tensor, peak, and, in case of ML tractography, raw diffusion-weighted images are currently supported.</string>
+           </property>
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;select image in data-manager&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="m_ForestLabel">
+           <property name="toolTip">
+            <string/>
+           </property>
+           <property name="text">
+            <string>Tractography Forest:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QmitkDataStorageComboBox" name="m_ForestBox">
+           <property name="toolTip">
+            <string>Random forest for machine learning based tractography.</string>
+           </property>
+           <property name="sizeAdjustPolicy">
+            <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+           </property>
+           <item>
+            <property name="text">
+             <string>-</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Mask Image:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="m_TensorImageLabel">
-        <property name="toolTip">
-         <string>Input Image. ODF, tensor, peak, and, in case of ML tractography, raw diffusion-weighted images are currently supported.</string>
-        </property>
-        <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;mandatory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="wordWrap">
+       <widget class="QCommandLinkButton" name="commandLinkButton_2">
+        <property name="enabled">
          <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="m_TargetImageLabel">
         <property name="toolTip">
-         <string/>
+         <string>Stop tractography and return all fibers reconstructed until now.</string>
         </property>
         <property name="text">
-         <string>Target Image:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_MaskImageBox">
-        <property name="toolTip">
-         <string>Tractography is only performed inside the mask image. Fibers that leave the mask image are stopped.</string>
+         <string>Stop Tractography</string>
         </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-        </property>
-        <item>
-         <property name="text">
-          <string>-</string>
-         </property>
-        </item>
        </widget>
       </item>
       <item row="3" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Stop Image:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="m_ForestLabel">
-        <property name="toolTip">
-         <string/>
+       <widget class="QCommandLinkButton" name="commandLinkButton">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
         <property name="text">
-         <string>Tractography Forest:</string>
+         <string>Start Tractography</string>
         </property>
        </widget>
       </item>
-      <item row="7" column="1">
-       <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_FaImageBox">
-        <property name="toolTip">
-         <string>If an image is selected, the stopping criterion is not calculated from the input image but instead the selected image is used.</string>
-        </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-        </property>
-        <item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" rowspan="6">
+    <widget class="QToolBox" name="toolBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="page_seed">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>435</width>
+        <height>297</height>
+       </rect>
+      </property>
+      <attribute name="label">
+       <string>Seeding</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Specify how, where and how many tractography seed points are placed.</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_17">
+       <item row="0" column="0">
+        <widget class="QFrame" name="m_InteractiveSeedingFrame">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_15">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="1" column="0">
+           <widget class="QFrame" name="frame_7">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_13">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="2" column="1">
+              <widget class="QSpinBox" name="m_NumSeedsBox">
+               <property name="toolTip">
+                <string>Number of seed points equally distributed around selected position.</string>
+               </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>9999999</number>
+               </property>
+               <property name="value">
+                <number>50</number>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="m_FaThresholdLabel_4">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Radius:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QDoubleSpinBox" name="m_SeedRadiusBox">
+               <property name="toolTip">
+                <string>Seedpoints are equally distributed within a sphere centered at the selected position with the specified radius (in mm).</string>
+               </property>
+               <property name="decimals">
+                <number>2</number>
+               </property>
+               <property name="maximum">
+                <double>50.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="value">
+                <double>2.000000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="m_SeedsPerVoxelLabel_4">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Num. Seeds:</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="m_ParamUpdateBox">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="toolTip">
+             <string>When checked, parameter changes cause instant retracking while in interactive mode.</string>
+            </property>
+            <property name="text">
+             <string>Update on Parameter Change</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QFrame" name="frame_8">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_16">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="m_TrialsPerSeedBox">
+            <property name="toolTip">
+             <string>Try each seed N times until a valid streamline is obtained (only for probabilistic tractography).</string>
+            </property>
+            <property name="statusTip">
+             <string>Minimum fiber length (in mm)</string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>999</number>
+            </property>
+            <property name="value">
+             <number>10</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="m_TrialsPerSeedLabel">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Trials Per Seed:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="m_FaThresholdLabel_2">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Max. Num. Fibers:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="m_NumFibersBox">
+            <property name="toolTip">
+             <string>Tractography is stopped after the desired number of fibers is reached, even before all seed points are processed (-1 means no limit).</string>
+            </property>
+            <property name="minimum">
+             <number>-1</number>
+            </property>
+            <property name="maximum">
+             <number>999999999</number>
+            </property>
+            <property name="value">
+             <number>-1</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QFrame" name="m_StaticSeedingFrame">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="m_SeedsPerVoxelBox">
+            <property name="toolTip">
+             <string>Number of seed points placed in each voxel. </string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>9999999</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="m_SeedsPerVoxelLabel">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Seeds per Voxel:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_SeedImageBox">
+            <property name="toolTip">
+             <string>Seed points are only placed inside the regions defined in the seed image. If no seed image is selected, the whole image is seeded.</string>
+            </property>
+            <property name="sizeAdjustPolicy">
+             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+            </property>
+            <item>
+             <property name="text">
+              <string>-</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_6">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Seed Image:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="m_InteractiveBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="toolTip">
+          <string>Dynamically pick a seed location by click into image.</string>
+         </property>
          <property name="text">
-          <string>-</string>
+          <string>Enable Interactive Tractography</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_constraints">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>435</width>
+        <height>297</height>
+       </rect>
+      </property>
+      <attribute name="label">
+       <string>ROI Constraints</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Specify various ROI and mask images to constrain the tractography process.</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="3" column="0">
+        <widget class="QLabel" name="m_TargetImageLabel">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_10">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Endpoint Constraints:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QComboBox" name="m_EpConstraintsBox">
-        <property name="toolTip">
-         <string>Fibers that enter a region defined in this image will stop immediately.</string>
-        </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-        </property>
-        <item>
          <property name="text">
-          <string>No Constraints on EP locations</string>
+          <string>Target Image:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QComboBox" name="m_EpConstraintsBox">
+         <property name="toolTip">
+          <string>Select which fibers should be accepted or rejected based on the location of their endpoints.</string>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+         </property>
+         <item>
+          <property name="text">
+           <string>No Constraints on EP locations</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Both EPs in Target Image</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Both EPs in Target Image But Different Label</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>One EP in Seed Image and One EP in Target Image</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>At Least One EP in Target Image</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Exactly One EP in Target Image</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>No EP in Target Image</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-        <item>
          <property name="text">
-          <string>Both EPs in Target Image</string>
+          <string>Stop Image:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-        <item>
          <property name="text">
-          <string>Both EPs in Target Image But Different Label</string>
+          <string>Mask Image:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_TargetImageBox">
+         <property name="toolTip">
+          <string>The target image is used for the endpoint constraint strategy defined above.</string>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+         </property>
+         <item>
+          <property name="text">
+           <string>-</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_10">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-        <item>
          <property name="text">
-          <string>One EP in Seed Image and One EP in Target Image</string>
+          <string>Endpoint Constraints:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_MaskImageBox">
+         <property name="toolTip">
+          <string>Fibers that leave the regions defined in this image will stop immediately.</string>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+         </property>
+         <item>
+          <property name="text">
+           <string>-</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_StopImageBox">
+         <property name="toolTip">
+          <string>Fibers that enter a region defined in this image will stop immediately.</string>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+         </property>
+         <item>
+          <property name="text">
+           <string>-</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <spacer name="verticalSpacer_6">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_trackingparam">
+      <attribute name="label">
+       <string>Tractography Parameters</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Specify the behavior of the tractography at each streamline integration step (step size, deterministic/probabilistic, ...).</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_14">
+       <item row="11" column="0">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="10" column="1">
+        <widget class="QDoubleSpinBox" name="m_gBox">
+         <property name="toolTip">
+          <string>f=1 + g=0 means FACT (depending on the chosen interpolation). f=0 and g=1 means TEND (disable interpolation for this mode!).</string>
+         </property>
+         <property name="decimals">
+          <number>2</number>
+         </property>
+         <property name="maximum">
+          <double>1.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="value">
+          <double>0.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QComboBox" name="m_ModeBox">
+         <property name="toolTip">
+          <string>Toggle between deterministic and probabilistic tractography. Some modes might not be available for all types of tractography.</string>
+         </property>
+         <item>
+          <property name="text">
+           <string>Deterministic</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Probabilistic</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="m_FaThresholdLabel">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-        <item>
          <property name="text">
-          <string>At Least One EP in Target Image</string>
+          <string>Cutoff:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="mFaImageLabel">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-        <item>
          <property name="text">
-          <string>Exactly One EP in Target Image</string>
+          <string>FA/GFA Image:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="m_FaThresholdLabel_3">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-        <item>
          <property name="text">
-          <string>No EP in Target Image</string>
+          <string>Mode:</string>
          </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QCommandLinkButton" name="commandLinkButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Start Tractography</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Interactive Tractography</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="3" column="1">
-       <widget class="QSpinBox" name="m_NumSeedsBox">
-        <property name="toolTip">
-         <string>Number of seed points normally distributed around selected position.</string>
-        </property>
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>9999999</number>
-        </property>
-        <property name="value">
-         <number>50</number>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="m_SeedsPerVoxelLabel_4">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Num. Seeds:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="m_InteractiveBox">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="toolTip">
-         <string>Dynamically pick seed location by click into image.</string>
-        </property>
-        <property name="text">
-         <string>Enable Interactive Tractography</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QDoubleSpinBox" name="m_SeedRadiusBox">
-        <property name="toolTip">
-         <string>Seedpoints are normally distributed within a sphere centered at the selected position with the specified radius (in mm).</string>
-        </property>
-        <property name="decimals">
-         <number>2</number>
-        </property>
-        <property name="maximum">
-         <double>50.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.100000000000000</double>
-        </property>
-        <property name="value">
-         <double>2.500000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="m_FaThresholdLabel_4">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Radius:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="m_ParamUpdateBox">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="toolTip">
-         <string>When checked, parameter changes cause instant retracking while in interactive mode.</string>
-        </property>
-        <property name="text">
-         <string>Update on Parameter Change</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Parameters</string>
-     </property>
-     <layout class="QFormLayout" name="formLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="m_FaThresholdLabel_3">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Mode:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="m_ModeBox">
-        <property name="toolTip">
-         <string>Toggle between deterministic and probabilistic tractography. Some modes might not be available for all types of tractography.</string>
-        </property>
-        <item>
-         <property name="text">
-          <string>Deterministic</string>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="m_AngularThresholdLabel">
+         <property name="toolTip">
+          <string/>
          </property>
-        </item>
-        <item>
          <property name="text">
-          <string>Probabilistic</string>
+          <string>Angular Threshold:</string>
          </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="m_SeedsPerVoxelLabel">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Seeds per Voxel:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QSpinBox" name="m_SeedsPerVoxelBox">
-        <property name="toolTip">
-         <string>Number of seed points placed in each voxel. </string>
-        </property>
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>9999999</number>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="m_FaThresholdLabel_2">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Max. num. fibers:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QSpinBox" name="m_NumFibersBox">
-        <property name="toolTip">
-         <string>Tractography is stopped after the desired number of fibers is reached, even before all seed points are processed.</string>
-        </property>
-        <property name="minimum">
-         <number>-1</number>
-        </property>
-        <property name="maximum">
-         <number>999999999</number>
-        </property>
-        <property name="value">
-         <number>-1</number>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="m_FaThresholdLabel">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>Cutoff:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QDoubleSpinBox" name="m_ScalarThresholdBox">
-        <property name="toolTip">
-         <string>Threshold on peak magnitude, FA, GFA, ...</string>
-        </property>
-        <property name="decimals">
-         <number>5</number>
-        </property>
-        <property name="maximum">
-         <double>1.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.100000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.100000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="m_OdfCutoffLabel">
-        <property name="toolTip">
-         <string/>
-        </property>
-        <property name="text">
-         <string>ODF Cutoff:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QDoubleSpinBox" name="m_OdfCutoffBox">
-        <property name="toolTip">
-         <string>Additional threshold on the ODF magnitude. This is useful in case of CSD fODF tractography.</string>
-        </property>
-        <property name="decimals">
-         <number>5</number>
-        </property>
-        <property name="maximum">
-         <double>1.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.100000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.100000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QCheckBox" name="m_SharpenOdfsBox">
-        <property name="toolTip">
-         <string>If you are using dODF images as input, it is advisable to sharpen the ODFs (min-max normalize and raise to the power of 4). This is not necessary for CSD fODFs, since they are naturally much sharper.</string>
-        </property>
-        <property name="text">
-         <string>Sharpen ODFs</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>200</width>
-          <height>0</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="6" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Advanced Parameters</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_5">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0" colspan="2">
-       <widget class="QFrame" name="frame_2">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_3">
-         <property name="leftMargin">
-          <number>0</number>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QDoubleSpinBox" name="m_StepSizeBox">
+         <property name="toolTip">
+          <string>Step size (in voxels)</string>
          </property>
-         <property name="topMargin">
-          <number>0</number>
+         <property name="decimals">
+          <number>2</number>
          </property>
-         <property name="rightMargin">
-          <number>0</number>
+         <property name="minimum">
+          <double>0.010000000000000</double>
          </property>
-         <property name="bottomMargin">
-          <number>0</number>
+         <property name="maximum">
+          <double>10.000000000000000</double>
          </property>
-         <item row="5" column="1">
-          <widget class="QDoubleSpinBox" name="m_fBox">
-           <property name="toolTip">
-            <string>f=1 + g=0 means FACT (depending on the chosen interpolation). f=0 and g=1 means TEND (disable interpolation for this mode!).</string>
-           </property>
-           <property name="decimals">
-            <number>2</number>
-           </property>
-           <property name="maximum">
-            <double>1.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>0.100000000000000</double>
-           </property>
-           <property name="value">
-            <double>1.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QSpinBox" name="m_AngularThresholdBox">
-           <property name="toolTip">
-            <string>Default: 90° * step_size</string>
-           </property>
-           <property name="minimum">
-            <number>-1</number>
-           </property>
-           <property name="maximum">
-            <number>90</number>
-           </property>
-           <property name="singleStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>-1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QSpinBox" name="m_TrialsPerSeedBox">
-           <property name="toolTip">
-            <string>Try each seed N times until a valid streamline is obtained (only for probabilistic).</string>
-           </property>
-           <property name="statusTip">
-            <string>Minimum fiber length (in mm)</string>
-           </property>
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>999</number>
-           </property>
-           <property name="value">
-            <number>10</number>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="m_fLabel">
-           <property name="toolTip">
-            <string>f parameter of tensor tractography. f=1 + g=0 means FACT (depending on the chosen interpolation). f=0 and g=1 means TEND (disable interpolation for this mode!).</string>
-           </property>
-           <property name="text">
-            <string>f:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QFrame" name="frame">
-           <property name="frameShape">
-            <enum>QFrame::NoFrame</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_4">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="m_FlipXBox">
-              <property name="toolTip">
-               <string>Internally flips progression directions. This might be necessary depending on the input data.</string>
-              </property>
-              <property name="text">
-               <string>x</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QCheckBox" name="m_FlipYBox">
-              <property name="toolTip">
-               <string>Internally flips progression directions. This might be necessary depending on the input data.</string>
-              </property>
-              <property name="text">
-               <string>y</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="2">
-             <widget class="QCheckBox" name="m_FlipZBox">
-              <property name="toolTip">
-               <string>Internally flips progression directions. This might be necessary depending on the input data.</string>
-              </property>
-              <property name="text">
-               <string>z</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="7" column="0">
-          <widget class="QLabel" name="m_SeedsPerVoxelLabel_3">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Flip directions:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="m_AngularThresholdLabel">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Angular Threshold:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="QDoubleSpinBox" name="m_gBox">
-           <property name="toolTip">
-            <string>f=1 + g=0 means FACT (depending on the chosen interpolation). f=0 and g=1 means TEND (disable interpolation for this mode!).</string>
-           </property>
-           <property name="decimals">
-            <number>2</number>
-           </property>
-           <property name="maximum">
-            <double>1.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>0.100000000000000</double>
-           </property>
-           <property name="value">
-            <double>0.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QDoubleSpinBox" name="m_StepSizeBox">
-           <property name="toolTip">
-            <string>Step size (in voxels)</string>
-           </property>
-           <property name="decimals">
-            <number>2</number>
-           </property>
-           <property name="minimum">
-            <double>0.010000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>10.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>0.100000000000000</double>
-           </property>
-           <property name="value">
-            <double>0.500000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="m_MinTractLengthLabel">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Min. Tract Length:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="m_StepsizeLabel">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Step Size:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="m_TrialsPerSeedLabel">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Trials Per Seed:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QDoubleSpinBox" name="m_MinTractLengthBox">
-           <property name="toolTip">
-            <string>Shorter fibers are discarded.</string>
-           </property>
-           <property name="statusTip">
-            <string>Minimum fiber length (in mm)</string>
-           </property>
-           <property name="decimals">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <double>999.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>1.000000000000000</double>
-           </property>
-           <property name="value">
-            <double>20.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QLabel" name="m_gLabel">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>g:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="m_LoopCheckLabel">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Loop Check:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QSpinBox" name="m_LoopCheckBox">
-           <property name="toolTip">
-            <string>Shorter fibers are discarded.</string>
-           </property>
-           <property name="statusTip">
-            <string>Maximum allowed angular SDTEV over 4 voxel lengths. Default: no loop check. </string>
-           </property>
-           <property name="minimum">
-            <number>-1</number>
-           </property>
-           <property name="maximum">
-            <number>180</number>
-           </property>
-           <property name="value">
-            <number>-1</number>
-           </property>
-          </widget>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="value">
+          <double>0.500000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QSpinBox" name="m_LoopCheckBox">
+         <property name="toolTip">
+          <string>Maximum allowed angular SDTEV over 4 voxel lengths. Default: no loop check. </string>
+         </property>
+         <property name="statusTip">
+          <string/>
+         </property>
+         <property name="minimum">
+          <number>-1</number>
+         </property>
+         <property name="maximum">
+          <number>180</number>
+         </property>
+         <property name="value">
+          <number>-1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QmitkDataStorageComboBoxWithSelectNone" name="m_FaImageBox">
+         <property name="toolTip">
+          <string>If an image is selected, the stopping criterion is not calculated from the input image but instead the selected image is used.</string>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+         </property>
+         <item>
+          <property name="text">
+           <string>-</string>
+          </property>
          </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QFrame" name="frame_3">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_7">
-         <property name="leftMargin">
-          <number>0</number>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="m_StepsizeLabel">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="text">
+          <string>Step Size:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QDoubleSpinBox" name="m_OdfCutoffBox">
+         <property name="toolTip">
+          <string>Additional threshold on the ODF magnitude. This is useful in case of CSD fODF tractography. For fODFs a good default value is 0.1, for normalized dODFs, e.g. Q-ball ODFs, this threshold should be very low (0.00025) or 0.</string>
+         </property>
+         <property name="decimals">
+          <number>5</number>
+         </property>
+         <property name="maximum">
+          <double>1.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="value">
+          <double>0.000250000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QDoubleSpinBox" name="m_fBox">
+         <property name="toolTip">
+          <string>f=1 + g=0 means FACT (depending on the chosen interpolation). f=0 and g=1 means TEND (disable interpolation for this mode!).</string>
+         </property>
+         <property name="decimals">
+          <number>2</number>
+         </property>
+         <property name="maximum">
+          <double>1.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="value">
+          <double>1.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="m_SharpenOdfsBox">
+         <property name="toolTip">
+          <string>If you are using dODF images as input, it is advisable to sharpen the ODFs (min-max normalize and raise to the power of 4). This is not necessary for CSD fODFs, since they are naturally much sharper.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="m_fLabel">
+         <property name="toolTip">
+          <string>f parameter of tensor tractography. f=1 + g=0 means FACT (depending on the chosen interpolation). f=0 and g=1 means TEND (disable interpolation for this mode!).</string>
+         </property>
+         <property name="text">
+          <string>f:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="m_MinTractLengthLabel">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="text">
+          <string>Min. Tract Length:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QDoubleSpinBox" name="m_ScalarThresholdBox">
+         <property name="toolTip">
+          <string>Threshold on peak magnitude, FA, GFA, ...</string>
+         </property>
+         <property name="decimals">
+          <number>5</number>
+         </property>
+         <property name="maximum">
+          <double>1.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="value">
+          <double>0.100000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="m_OdfCutoffLabel">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="text">
+          <string>ODF Cutoff:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QDoubleSpinBox" name="m_MinTractLengthBox">
+         <property name="toolTip">
+          <string>Minimum tract length in mm. Shorter fibers are discarded.</string>
+         </property>
+         <property name="statusTip">
+          <string>Minimum fiber length (in mm)</string>
+         </property>
+         <property name="decimals">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <double>999.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>1.000000000000000</double>
+         </property>
+         <property name="value">
+          <double>20.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="m_LoopCheckLabel">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="text">
+          <string>Loop Check:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <widget class="QSpinBox" name="m_AngularThresholdBox">
+         <property name="toolTip">
+          <string>Angular threshold between two steps (in degree). Default: 90° * step_size</string>
+         </property>
+         <property name="minimum">
+          <number>-1</number>
          </property>
-         <property name="topMargin">
-          <number>0</number>
+         <property name="maximum">
+          <number>90</number>
          </property>
-         <property name="rightMargin">
-          <number>0</number>
+         <property name="singleStep">
+          <number>1</number>
          </property>
-         <property name="bottomMargin">
-          <number>0</number>
+         <property name="value">
+          <number>-1</number>
          </property>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="m_InterpolationBox">
-           <property name="toolTip">
-            <string>If false, nearest neighbor interpolation is used.</string>
-           </property>
-           <property name="text">
-            <string>Interpolate Tractography Data</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="m_MaskInterpolationBox">
-           <property name="toolTip">
-            <string>The tractography mask is not interpolated by default.</string>
-           </property>
-           <property name="text">
-            <string>Interpolate ROI Images</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Neighborhood Sampling</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_6">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QFrame" name="frame_4">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_10">
-         <property name="leftMargin">
-          <number>0</number>
+        </widget>
+       </item>
+       <item row="10" column="0">
+        <widget class="QLabel" name="m_gLabel">
+         <property name="toolTip">
+          <string/>
          </property>
-         <property name="topMargin">
-          <number>0</number>
+         <property name="text">
+          <string>g:</string>
          </property>
-         <property name="rightMargin">
-          <number>0</number>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="m_FaThresholdLabel_5">
+         <property name="toolTip">
+          <string/>
          </property>
-         <property name="bottomMargin">
-          <number>0</number>
+         <property name="text">
+          <string>Sharpen ODFs:</string>
          </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="m_SeedsPerVoxelLabel_2">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Num. Samples:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QSpinBox" name="m_NumSamplesBox">
-           <property name="toolTip">
-            <string>Number of neighborhood samples that are used to determine the next fiber progression direction.</string>
-           </property>
-           <property name="maximum">
-            <number>50</number>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="m_SamplingDistanceLabel">
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="text">
-            <string>Sampling Distance:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QDoubleSpinBox" name="m_SamplingDistanceBox">
-           <property name="toolTip">
-            <string>Sampling distance (in voxels)</string>
-           </property>
-           <property name="decimals">
-            <number>2</number>
-           </property>
-           <property name="maximum">
-            <double>10.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>0.100000000000000</double>
-           </property>
-           <property name="value">
-            <double>0.250000000000000</double>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="m_FrontalSamplesBox">
-        <property name="toolTip">
-         <string>Only neighborhood samples in front of the current streamline position are considered.</string>
-        </property>
-        <property name="text">
-         <string>Use Only Frontal Samples</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="m_StopVotesBox">
-        <property name="toolTip">
-         <string>If checked, the majority of sampling points has to place a stop-vote for the streamline to terminate. If not checked, all sampling positions have to vote for a streamline termination.</string>
-        </property>
-        <property name="text">
-         <string>Use Stop-Votes</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="9" column="0">
-    <spacer name="spacer1">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>220</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox_5">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Output and Postprocessing</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_9">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QFrame" name="frame_5">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_8">
-         <property name="leftMargin">
-          <number>0</number>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_neighborhood">
+      <attribute name="label">
+       <string>Neighborhood Sampling</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Specify if and how information about the current streamline neighborhood should be used.</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_18">
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="m_FrontalSamplesBox">
+         <property name="toolTip">
+          <string>Only neighborhood samples in front of the current streamline position are considered.</string>
          </property>
-         <property name="topMargin">
-          <number>0</number>
+         <property name="text">
+          <string>Use Only Frontal Samples</string>
          </property>
-         <property name="rightMargin">
-          <number>0</number>
+         <property name="checked">
+          <bool>false</bool>
          </property>
-         <property name="bottomMargin">
-          <number>0</number>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QCheckBox" name="m_StopVotesBox">
+         <property name="toolTip">
+          <string>If checked, the majority of sampling points has to place a stop-vote for the streamline to terminate. If not checked, all sampling positions have to vote for a streamline termination.</string>
          </property>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="m_ResampleFibersBox">
-           <property name="toolTip">
-            <string>Resample fibers using the specified error constraint.</string>
-           </property>
-           <property name="text">
-            <string>Compress Fibers</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QDoubleSpinBox" name="m_FiberErrorBox">
-           <property name="focusPolicy">
-            <enum>Qt::StrongFocus</enum>
-           </property>
-           <property name="toolTip">
-            <string>Lossy fiber compression. Recommended for large tractograms. Maximum error in mm.</string>
-           </property>
-           <property name="decimals">
-            <number>3</number>
-           </property>
-           <property name="maximum">
-            <double>10.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>0.010000000000000</double>
-           </property>
-           <property name="value">
-            <double>0.100000000000000</double>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="m_OutputProbMap">
-        <property name="toolTip">
-         <string>Output probability map instead of tractogram.</string>
-        </property>
-        <property name="text">
-         <string>Output Probability Map</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QCommandLinkButton" name="commandLinkButton_2">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="text">
-      <string>Stop Tractography</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QTextEdit" name="m_StatusTextBox">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
+         <property name="text">
+          <string>Use Stop-Votes</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QFrame" name="frame_4">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_10">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="m_SeedsPerVoxelLabel_2">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Num. Samples:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="m_NumSamplesBox">
+            <property name="toolTip">
+             <string>Number of neighborhood samples that are used to determine the next fiber progression direction.</string>
+            </property>
+            <property name="maximum">
+             <number>50</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="m_SamplingDistanceLabel">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Sampling Distance:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QDoubleSpinBox" name="m_SamplingDistanceBox">
+            <property name="toolTip">
+             <string>Sampling distance (in voxels)</string>
+            </property>
+            <property name="decimals">
+             <number>2</number>
+            </property>
+            <property name="maximum">
+             <double>10.000000000000000</double>
+            </property>
+            <property name="singleStep">
+             <double>0.100000000000000</double>
+            </property>
+            <property name="value">
+             <double>0.250000000000000</double>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_data">
+      <attribute name="label">
+       <string>Data Handling</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Specify interpolation and direction flips.</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_6">
+       <item row="1" column="0">
+        <widget class="QFrame" name="frame_3">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_7">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="m_InterpolationBox">
+            <property name="toolTip">
+             <string>Trilinearly interpolate the input image used for tractography.</string>
+            </property>
+            <property name="text">
+             <string>Interpolate Tractography Data</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="m_MaskInterpolationBox">
+            <property name="toolTip">
+             <string>Trilinearly interpolate the ROI images used to constrain the tractography.</string>
+            </property>
+            <property name="text">
+             <string>Interpolate ROI Images</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QFrame" name="frame_2">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="7" column="1">
+           <widget class="QFrame" name="frame">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_4">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="m_FlipXBox">
+               <property name="toolTip">
+                <string>Internally flips progression directions. This might be necessary depending on the input data.</string>
+               </property>
+               <property name="text">
+                <string>x</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QCheckBox" name="m_FlipYBox">
+               <property name="toolTip">
+                <string>Internally flips progression directions. This might be necessary depending on the input data.</string>
+               </property>
+               <property name="text">
+                <string>y</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QCheckBox" name="m_FlipZBox">
+               <property name="toolTip">
+                <string>Internally flips progression directions. This might be necessary depending on the input data.</string>
+               </property>
+               <property name="text">
+                <string>z</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="m_SeedsPerVoxelLabel_3">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Flip directions:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_output">
+      <attribute name="label">
+       <string>Output and Postprocessing</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Specify the tractography output (streamlines or probability maps) and postprocessing steps.</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_5">
+       <item row="0" column="0">
+        <widget class="QFrame" name="frame_5">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_8">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="m_ResampleFibersBox">
+            <property name="toolTip">
+             <string>Compress fibers using the specified error constraint.</string>
+            </property>
+            <property name="text">
+             <string>Compress Fibers</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QDoubleSpinBox" name="m_FiberErrorBox">
+            <property name="focusPolicy">
+             <enum>Qt::StrongFocus</enum>
+            </property>
+            <property name="toolTip">
+             <string>Lossy fiber compression. Recommended for large tractograms. Maximum error in mm.</string>
+            </property>
+            <property name="decimals">
+             <number>3</number>
+            </property>
+            <property name="maximum">
+             <double>10.000000000000000</double>
+            </property>
+            <property name="singleStep">
+             <double>0.010000000000000</double>
+            </property>
+            <property name="value">
+             <double>0.100000000000000</double>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="m_OutputProbMap">
+         <property name="toolTip">
+          <string>Output map with voxel-wise visitation counts instead of streamlines.</string>
+         </property>
+         <property name="text">
+          <string>Output Probability Map</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkDataStorageComboBoxWithSelectNone</class>
    <extends>QComboBox</extends>
    <header>QmitkDataStorageComboBoxWithSelectNone.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/mitkPluginActivator.cpp
index 7e265b7c98..d5ad628635 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/mitkPluginActivator.cpp
@@ -1,51 +1,49 @@
 /*===================================================================
 
 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 "mitkPluginActivator.h"
 
 #include "src/internal/Perspectives/QmitkGibbsTractographyPerspective.h"
 #include "src/internal/Perspectives/QmitkStreamlineTractographyPerspective.h"
-#include "src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.h"
 
 #include "src/internal/QmitkGibbsTrackingView.h"
 #include "src/internal/QmitkStreamlineTrackingView.h"
 #include "src/internal/QmitkMLBTView.h"
 
 ctkPluginContext* mitk::PluginActivator::m_Context = nullptr;
 
 ctkPluginContext* mitk::PluginActivator::GetContext()
 {
   return m_Context;
 }
 
 void mitk::PluginActivator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(QmitkGibbsTractographyPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkStreamlineTractographyPerspective, context)
-  BERRY_REGISTER_EXTENSION_CLASS(QmitkMachineLearningTractographyPerspective, context)
 
   BERRY_REGISTER_EXTENSION_CLASS(QmitkGibbsTrackingView, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkStreamlineTrackingView, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkMLBTView, context)
 
   m_Context = context;
 }
 
 void mitk::PluginActivator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
   m_Context = nullptr;
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake
index 624eea1730..f8797c5460 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake
@@ -1,62 +1,65 @@
 set(SRC_CPP_FILES
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
   QmitkDiffusionDicomImportView.cpp
   QmitkControlVisualizationPropertiesView.cpp
   QmitkDicomTractogramTagEditorView.cpp
 
   Perspectives/QmitkDiffusionDefaultPerspective.cpp
+  Perspectives/QmitkSegmentationPerspective.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkDiffusionDicomImportViewControls.ui
   src/internal/QmitkControlVisualizationPropertiesViewControls.ui
   src/internal/QmitkDicomTractogramTagEditorViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
   src/internal/QmitkDiffusionDicomImportView.h
   src/internal/QmitkControlVisualizationPropertiesView.h
   src/internal/QmitkDicomTractogramTagEditorView.h
 
   src/internal/Perspectives/QmitkDiffusionDefaultPerspective.h
+  src/internal/Perspectives/QmitkSegmentationPerspective.h
 )
 
 set(CACHED_RESOURCE_FILES
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
   plugin.xml
 
   resources/dwiimport.png
   resources/vizControls.png
   resources/arrow.png
   resources/dwi.png
   resources/odf.png
   resources/tensor.png
   resources/tractogram.png
   resources/odf_peaks.png
   resources/ml_tractogram.png
   resources/refresh.xpm
+  resources/segmentation.svg
  )
 
 set(QRC_FILES
 # uncomment the following line if you want to use Qt resources
   resources/QmitkDiffusionImaging.qrc
   #resources/QmitkTractbasedSpatialStatisticsView.qrc
 )
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml
index c7985e2611..c08090a4e7 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml
@@ -1,50 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
 
   <extension point="org.blueberry.ui.keywords">
 
   <keyword label="DICOM" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tractography" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tracking" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tractogram" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tag" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
 
   <keyword label="DICOM" id="org.mitk.views.diffusiondicomimport.Keyword"/>
   <keyword label="image" id="org.mitk.views.diffusiondicomimport.Keyword"/>
   <keyword label="data" id="org.mitk.views.diffusiondicomimport.Keyword"/>
   <keyword label="load" id="org.mitk.views.diffusiondicomimport.Keyword"/>
 
   </extension>
 
+  <extension point="org.blueberry.ui.perspectives">
+
+    <perspective id="org.mitk.perspectives.segmentation"
+    name="Image Segmentation"
+    class="QmitkSegmentationPerspective"
+    icon="resources/segmentation.svg">
+    <description>This perspective contains views to perform manual image segmentation.</description>
+    </perspective>
+
+  </extension>
 
   <extension point="org.blueberry.ui.views">
 
     <view id="org.mitk.views.diffusiondicomimport"
     name="DICOM Import"
     category="Data handling"
     class="QmitkDiffusionDicomImport"
     icon="resources/dwiimport.png">
     <description>Diffusion DICOM data import</description>
     <keywordReference id="org.mitk.views.diffusiondicomimport.Keyword"/>
     </view>
 
     <view id="org.mitk.views.controlvisualizationpropertiesview"
     name="Visualization"
     icon="resources/vizControls.png"
     class="QmitkControlVisualizationPropertiesView">
     <keywordReference id="org.mitk.views.controlvisualizationpropertiesview.Keyword"/>
     </view>
 
     <view id="org.mitk.views.dicomtractogramtageditor"
     name="DICOM Tractogram Tag Editor"
     category="Fiber Tractography"
     class="QmitkDicomTractogramTagEditorView"
     icon="resources/dwiimport.png">
     <keywordReference id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
     </view>
 
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc
index cd94502f0b..edee859a05 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc
@@ -1,31 +1,32 @@
 <RCC>
     <qresource prefix="/QmitkDiffusionImaging">
         <file>dwi.png</file>
         <file>dwiimport.png</file>
         <file>texIntONIcon.png</file>
         <file>texIntOFFIcon.png</file>
         <file>vizControls.png</file>
         <file>Refresh_48.png</file>
         <file>glyphsoff_C.png</file>
         <file>glyphsoff_S.png</file>
         <file>glyphsoff_T.png</file>
         <file>glyphson_C.png</file>
         <file>glyphson_S.png</file>
         <file>glyphson_T.png</file>
         <file>color24.gif</file>
         <file>color48.gif</file>
         <file>color64.gif</file>
         <file>crosshair.png</file>
         <file>paint2.png</file>
         <file>reset.png</file>
         <file>MapperEfx2D.png</file>
         <file>refresh.xpm</file>
         <file>tensor.png</file>
         <file>tractogram.png</file>
         <file>ml_tractogram.png</file>
         <file>ConnectomicsNetwork.png</file>
         <file>odf.png</file>
         <file>DiffData24.png</file>
         <file>odf_peaks.png</file>
+        <file>segmentation.svg</file>
     </qresource>
 </RCC>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/resources/segmentation.svg b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/segmentation.svg
new file mode 100644
index 0000000000..1ba1aa7f2d
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/segmentation.svg
@@ -0,0 +1,1980 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="110"
+   height="110"
+   viewBox="0 0 110 110"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Segmentation.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1266"
+     inkscape:window-height="793"
+     id="namedview359"
+     showgrid="false"
+     inkscape:zoom="2.1454545"
+     inkscape:cx="55"
+     inkscape:cy="55"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g5371" />
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4179">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4181"
+         width="58.57143"
+         height="31.964285"
+         x="179.10715"
+         y="1010.0407" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4200">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4202"
+         width="26.607143"
+         height="31.785715"
+         x="198.03572"
+         y="1062.8978" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4206">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4208"
+         width="18.182745"
+         height="20.708128"
+         x="199.48053"
+         y="1066.8756" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4212">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4214"
+         width="15.278557"
+         height="20.266186"
+         x="197.83905"
+         y="1066.0548" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-44"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-81">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-7-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-44-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-81-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-9-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-2-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-8-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-7-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-8-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-1-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-2-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-9-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-2-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-83">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-73"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-5">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-7-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-44-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-81-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-9-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-2-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-8-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-7-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-8-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-1-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-2-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-9-5">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-2-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-99">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-22"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-7-07">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-44-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-81-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-9-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-2-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-8-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-7-61">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-8-98"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-1-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-2-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-9-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-2-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-80">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-08"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-80">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-97"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-7-08">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-44-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-81-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-9-12"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-2-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-8-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-7-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-8-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-1-94">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-2-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-9-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-2-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-78"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-27">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-7-08-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-44-4-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-81-7-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-9-12-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-2-0-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-8-8-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-7-4-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-8-6-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-1-94-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-2-9-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-9-6-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-2-1-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-0-5">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-78-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-27-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-5-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-88">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-69">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-99"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-0-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-6-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-6-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-1-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-6-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-9-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-9-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-9-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-8-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-4-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-7-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-1-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-79">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-8-1-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-4-7-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-7-4-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-1-7-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-6-1-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-9-5-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-9-6-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-9-2-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3-8-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3-9-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62-8-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4-1-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-0-2-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-6-8-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-6-2-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-1-4-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-88-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-8-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-69-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-99-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-8-1-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-4-7-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-7-4-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-1-7-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-6-1-5">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-9-5-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-9-6-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-9-2-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3-8-30">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3-9-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62-8-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4-1-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-0-2-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-6-8-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-6-2-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-1-4-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-88-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-8-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-69-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-99-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-88-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-8-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-69-90">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-99-69"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-0-2-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-6-8-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-6-2-9">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-1-4-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3-8-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3-9-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62-8-78">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4-1-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-6-1-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-9-5-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-9-6-3">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-9-2-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-8-1-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-4-7-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-7-4-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-1-7-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-88-72">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-8-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-69-23">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-99-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-0-2-27">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-6-8-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-6-2-82">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-1-4-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3-8-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3-9-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62-8-38">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4-1-2"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-6-1-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-9-5-52"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-9-6-02">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-9-2-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-8-1-10">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-4-7-5"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-7-4-5">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-1-7-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-88-72-6">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-8-0-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-69-23-7">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-99-0-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-0-2-27-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-6-8-7-4"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-6-2-82-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-1-4-6-7"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3-8-4-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3-9-4-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62-8-38-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4-1-2-3"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-6-1-2-2">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-9-5-52-6"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-9-6-02-0">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-9-2-0-0"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-8-8-1-10-8">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-94-4-7-5-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-98-7-4-5-4">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-0-1-7-1-1"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-9-3-1">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-49-3-8"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4829-6-2-62-84">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f500ff;fill-opacity:0.33000004;fill-rule:nonzero;stroke:#c95f5f;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4831-7-7-4-9"
+         width="414.28571"
+         height="1908.5714"
+         x="-705.71429"
+         y="-259.06638" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.77700001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 34.804981,66.671073 7.230313,-7.230305 -9.474198,-9.474286 -7.230329,7.23014 0,3.490768 5.98371,0 0,5.983683 z M 62.230317,21.793061 c -0.664846,-0.664789 -1.35048,-0.643918 -2.056882,0.06322 L 38.357824,43.672008 c -0.706418,0.706381 -0.727186,1.391878 -0.06226,2.056831 0.664846,0.664802 1.350479,0.644107 2.0569,-0.06309 L 62.168068,23.85017 c 0.706401,-0.70652 0.727169,-1.39203 0.06226,-2.056996 z m -0.997277,-8.975448 17.951115,17.951073 -41.88595,41.886183 -17.951165,0 0,-17.951313 z M 88.907695,21.045126 83.173306,26.779547 65.222158,8.828436 70.95656,3.0940902 C 72.120058,1.9305767 73.532877,1.34882 75.19502,1.34882 c 1.662143,0 3.074978,0.5817567 4.238458,1.7452702 l 9.474216,9.4741978 c 1.163512,1.163564 1.745266,2.576301 1.745266,4.238463 0,1.662162 -0.581754,3.074899 -1.745266,4.238375 z"
+     id="path4138-9" />
+  <g
+     transform="translate(0,12)"
+     id="g5371">
+    <g
+       id="g4857-7"
+       transform="matrix(0.04170618,0,0,0.04170618,23.342056,90.91554)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-83)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-78" />
+      <path
+         clip-path="url(#clipPath4829-6-5)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-69"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-6-3"
+       transform="matrix(0.04170618,0,0,0.04170618,35.494577,90.91554)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-1-9)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-9-1" />
+      <path
+         clip-path="url(#clipPath4829-6-9-9)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-6-1"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-14-3"
+       transform="matrix(0.04170618,0,0,0.04170618,47.647104,90.91554)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-2-7)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-6-6" />
+      <path
+         clip-path="url(#clipPath4829-6-7-1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-0-8"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-4-0"
+       transform="matrix(0.04170618,0,0,0.04170618,59.799628,90.91554)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-7-8)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-0-6" />
+      <path
+         clip-path="url(#clipPath4829-6-81-3)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-3-4"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-2"
+       transform="matrix(0.04170618,0,0,0.04170618,71.952155,90.91554)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-0)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-1" />
+      <path
+         clip-path="url(#clipPath4829-6-2-6)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-2"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-5"
+       transform="matrix(0.04170618,0,0,0.04170618,23.342056,78.81404)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-4)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-63" />
+      <path
+         clip-path="url(#clipPath4829-6-99)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-2"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-6-4"
+       transform="matrix(0.04170618,0,0,0.04170618,35.494577,78.81404)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-1-7)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-9-4" />
+      <path
+         clip-path="url(#clipPath4829-6-9-5)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-6-7"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-14-8"
+       transform="matrix(0.04170618,0,0,0.04170618,47.647104,78.81404)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-2-3)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-6-1" />
+      <path
+         clip-path="url(#clipPath4829-6-7-6)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-0-2"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-0"
+       transform="matrix(0.04170618,0,0,0.04170618,71.952155,78.81404)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-3)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-9" />
+      <path
+         clip-path="url(#clipPath4829-6-2-62)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-3"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-71"
+       transform="matrix(0.04170618,0,0,0.04170618,23.342056,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-80)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-633" />
+      <path
+         clip-path="url(#clipPath4829-6-80)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-33"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-6-8"
+       transform="matrix(0.04170618,0,0,0.04170618,35.494577,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-1-3)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-9-47" />
+      <path
+         clip-path="url(#clipPath4829-6-9-1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-6-73"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-14-0"
+       transform="matrix(0.04170618,0,0,0.04170618,47.647104,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-2-1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-6-3" />
+      <path
+         clip-path="url(#clipPath4829-6-7-61)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-0-4"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-4-6"
+       transform="matrix(0.04170618,0,0,0.04170618,59.799627,66.70724)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-7-07)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-0-60" />
+      <path
+         clip-path="url(#clipPath4829-6-81-4)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-3-7"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-5"
+       transform="matrix(0.04170618,0,0,0.04170618,71.952155,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-6)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-3" />
+      <path
+         clip-path="url(#clipPath4829-6-2-9)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-1"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-2-2"
+       transform="matrix(0.04170618,0,0,0.04170618,84.104683,90.91554)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-0-2)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-1-3" />
+      <path
+         clip-path="url(#clipPath4829-6-2-6-2)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-2-8"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-0-7"
+       transform="matrix(0.04170618,0,0,0.04170618,84.104683,78.81404)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-3-8)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-9-1" />
+      <path
+         clip-path="url(#clipPath4829-6-2-62-8)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-3-7"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-5-5"
+       transform="matrix(0.04170618,0,0,0.04170618,84.104683,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-6-1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-3-4" />
+      <path
+         clip-path="url(#clipPath4829-6-2-9-6)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-1-7"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-2-2-0"
+       transform="matrix(0.04170618,0,0,0.04170618,96.257203,90.91554)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-0-2-2)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-1-3-3" />
+      <path
+         clip-path="url(#clipPath4829-6-2-6-2-9)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-2-8-7"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-0-7-4"
+       transform="matrix(0.04170618,0,0,0.04170618,96.257203,78.81404)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-3-8-6)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-9-1-8" />
+      <path
+         clip-path="url(#clipPath4829-6-2-62-8-78)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-3-7-5"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-5-5-1"
+       transform="matrix(0.04170618,0,0,0.04170618,96.257203,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-6-1-0)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-3-4-5" />
+      <path
+         clip-path="url(#clipPath4829-6-2-9-6-3)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-1-7-8"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-2-2-4"
+       transform="matrix(0.04170618,0,0,0.04170618,108.40971,90.91554)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-0-2-27)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-1-3-6" />
+      <path
+         clip-path="url(#clipPath4829-6-2-6-2-82)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-2-8-6"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-0-7-43"
+       transform="matrix(0.04170618,0,0,0.04170618,108.40971,78.81404)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-3-8-4)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-9-1-1" />
+      <path
+         clip-path="url(#clipPath4829-6-2-62-8-38)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-3-7-3"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-5-5-7"
+       transform="matrix(0.04170618,0,0,0.04170618,108.40971,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-6-1-2)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-3-4-4" />
+      <path
+         clip-path="url(#clipPath4829-6-2-9-6-02)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-1-7-4"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-2-2-4-6"
+       transform="matrix(0.04170618,0,0,0.04170618,120.56227,90.91554)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-0-2-27-2)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-1-3-6-9" />
+      <path
+         clip-path="url(#clipPath4829-6-2-6-2-82-1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-2-8-6-5"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-0-7-43-5"
+       transform="matrix(0.04170618,0,0,0.04170618,120.56227,78.81404)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-3-8-4-0)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-9-1-1-0" />
+      <path
+         clip-path="url(#clipPath4829-6-2-62-8-38-4)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-3-7-3-7"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <g
+       id="g4857-63-5-5-7-6"
+       transform="matrix(0.04170618,0,0,0.04170618,120.56227,66.70724)">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-6-1-2-2)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-3-4-4-3" />
+      <path
+         clip-path="url(#clipPath4829-6-2-9-6-02-0)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-1-7-4-3"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 26.695279,97.076595 c -1.076562,-0.553267 -1.316999,-1.476936 -1.327043,-5.098006 -0.0084,-3.018757 0.172567,-4.078474 0.820213,-4.803764 l 0.463337,-0.518884 3.700298,-0.05232 c 4.312432,-0.06097 4.659845,0.01358 5.2249,1.121174 0.328645,0.644197 0.345088,0.888046 0.298094,4.420647 -0.04828,3.629124 -0.06119,3.754893 -0.439889,4.285857 -0.214583,0.300859 -0.571653,0.616023 -0.793489,0.700365 -0.627346,0.238517 -7.467389,0.191114 -7.946421,-0.05507 z"
+       id="path4722" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9ff;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 26.787826,97.195415 c -0.559685,-0.178425 -1.121053,-0.946523 -1.319025,-1.804773 -0.04588,-0.198897 -0.08244,-1.706842 -0.08358,-3.446729 -0.0022,-3.426135 0.03232,-3.729184 0.510092,-4.473724 0.141189,-0.220024 0.405394,-0.498477 0.587123,-0.618784 l 0.330416,-0.218741 3.67276,-0.0256 c 3.887019,-0.0271 4.098709,-0.01068 4.584136,0.355531 0.314984,0.237627 0.73074,1.014178 0.851179,1.589834 0.123454,0.590066 0.123454,6.199485 0,6.789552 -0.120883,0.577778 -0.53724,1.353813 -0.851179,1.586486 -0.138715,0.102807 -0.378246,0.229121 -0.532291,0.280697 -0.38063,0.12744 -7.345513,0.115087 -7.749634,-0.01375 z"
+       id="path4726" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9ff;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 26.849145,97.223093 c -0.590398,-0.182202 -1.119753,-0.850384 -1.338236,-1.689197 -0.187521,-0.719942 -0.187521,-6.453449 0,-7.173391 0.1637,-0.628486 0.5518,-1.231254 0.971654,-1.5091 l 0.33054,-0.218741 3.892127,0 3.892127,0 0.35728,0.250072 c 0.267077,0.186936 0.44049,0.413214 0.686864,0.896252 l 0.329584,0.646181 0,3.522031 0,3.522032 -0.329584,0.646181 c -0.246295,0.482885 -0.419844,0.709376 -0.686755,0.896253 l -0.357172,0.250071 -3.762624,0.01512 c -2.069443,0.0083 -3.863056,-0.01588 -3.985805,-0.05376 z"
+       id="path4728" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 87.423328,72.931035 c -0.364444,-0.163148 -0.743489,-0.600712 -1.004889,-1.160029 l -0.23105,-0.494376 -0.02618,-3.21344 c -0.0279,-3.424173 0.0084,-3.890248 0.356067,-4.570228 0.222763,-0.435705 0.64346,-0.862121 0.973214,-0.986443 0.375426,-0.141541 7.650456,-0.118407 7.994688,0.02542 0.364547,0.152317 0.836432,0.721542 1.062208,1.28132 0.179231,0.444376 0.186314,0.565563 0.212258,3.631958 0.02861,3.381447 -0.0081,3.849705 -0.355461,4.529029 -0.222763,0.435706 -0.64346,0.862122 -0.973214,0.986444 -0.370214,0.139577 -7.690162,0.112466 -8.007639,-0.02966 z"
+       id="path5312" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 87.423328,72.931035 c -0.364444,-0.163148 -0.743489,-0.600712 -1.004889,-1.160029 l -0.23105,-0.494376 0,-3.543024 0,-3.543025 0.23105,-0.494375 c 0.267256,-0.571846 0.64465,-1.00109 1.022841,-1.163368 0.384327,-0.164911 7.646063,-0.167122 8.040182,-0.0024 0.520089,0.217307 1.032524,0.971184 1.201254,1.767242 0.125787,0.593452 0.125707,6.279036 -8.2e-5,6.871948 -0.176634,0.832478 -0.701629,1.583746 -1.251653,1.791113 -0.370214,0.139577 -7.690162,0.112466 -8.007639,-0.02966 l -1.4e-5,0 z"
+       id="path5318" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 87.464525,85.068188 c -0.30883,-0.1225 -0.732382,-0.561473 -0.947251,-0.981739 -0.347654,-0.679979 -0.383966,-1.146054 -0.356067,-4.570227 l 0.02618,-3.213441 0.23105,-0.494375 c 0.267256,-0.571846 0.64465,-1.00109 1.022841,-1.163368 0.212556,-0.09121 1.008133,-0.113769 4.011437,-0.113769 2.441233,0 3.8271,0.03046 3.97825,0.08745 0.329754,0.124322 0.750451,0.550737 0.973214,0.986443 0.347319,0.679325 0.38407,1.147583 0.355461,4.529029 -0.02594,3.066396 -0.03303,3.187582 -0.212258,3.631959 -0.225776,0.559778 -0.697661,1.129003 -1.062208,1.28132 -0.216033,0.09026 -1.025722,0.111826 -4.042401,0.107649 -2.287179,-0.0032 -3.853355,-0.03739 -3.97825,-0.08693 z"
+       id="path5320" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 63.15773,97.180388 c -0.30883,-0.1225 -0.732383,-0.561474 -0.947252,-0.981739 -0.347653,-0.679979 -0.383965,-1.146055 -0.356067,-4.570227 l 0.02618,-3.213441 0.22401,-0.478101 c 0.285907,-0.610206 0.496291,-0.876824 0.87399,-1.107598 0.302416,-0.184777 0.306753,-0.184969 4.175339,-0.184969 3.868586,0 3.872923,1.92e-4 4.175338,0.184969 0.3777,0.230774 0.588084,0.497392 0.873991,1.107598 l 0.22401,0.478101 0.02659,3.213441 c 0.02782,3.362089 -0.01064,3.894038 -0.326346,4.512862 -0.251145,0.492284 -0.713012,0.953922 -1.047292,1.04677 -0.399146,0.110866 -7.641338,0.103859 -7.922494,-0.0077 l 0,-3e-6 z"
+       id="path5326" />
+    <g
+       id="g4857-63-0-0"
+       transform="matrix(0.04170618,0,0,0.04170618,59.799628,78.81404)"
+       style="fill:#ff00ff;fill-opacity:1">
+      <path
+         transform="matrix(0.84608119,0,0,1,-61.628007,-0.21428438)"
+         clip-path="url(#clipPath4829-9-3-1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-70-9-7" />
+      <path
+         clip-path="url(#clipPath4829-6-2-62-84)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -303.56249,152.93363 -40.97322,0 -40.97321,0 -40.97322,0 -40.97321,0 -40.97322,0 c -13.65774,0 -25.47694,-6.33333 -35.45759,-19 -9.98065,-12.66667 -14.97098,-27.66667 -14.97098,-44.999997 l 0,-128 c 0,-17.333333 4.99033,-32.333333 14.97098,-45 9.98065,-12.666669 21.79985,-19.000003 35.45759,-19.000003 l 40.97322,0 40.97321,0 40.97322,0 40.97321,0 40.97322,0"
+         id="path4767-7-5-3-4"
+         transform="matrix(-0.84608119,0,0,1,-751.30501,-0.21428438)" />
+    </g>
+  </g>
+</svg>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkSegmentationPerspective.cpp
similarity index 87%
rename from Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.cpp
rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkSegmentationPerspective.cpp
index 9d899f42e0..d2b5bc791f 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkSegmentationPerspective.cpp
@@ -1,50 +1,49 @@
 /*===================================================================
 
 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 "QmitkMachineLearningTractographyPerspective.h"
+#include "QmitkSegmentationPerspective.h"
 #include "berryIViewLayout.h"
 
-void QmitkMachineLearningTractographyPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
+void QmitkSegmentationPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
     /////////////////////////////////////////////////////
     // all di-app perspectives should have the following:
     /////////////////////////////////////////////////////
 
     QString editorArea = layout->GetEditorArea();
 
     layout->AddStandaloneViewPlaceholder("org.mitk.views.viewnavigatorview", berry::IPageLayout::LEFT, 0.3f, editorArea, false);
 
     layout->AddStandaloneView("org.mitk.views.datamanager",
                               false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
     layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
                               false, berry::IPageLayout::BOTTOM, .15f, "org.mitk.views.datamanager");
 
     berry::IFolderLayout::Pointer left =
             layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
                                  berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
     layout->AddStandaloneViewPlaceholder("org.mitk.views.imagenavigator",
                                          berry::IPageLayout::BOTTOM, .7f, "org.mbi.diffusionimaginginternal.leftcontrols", false);
 
     /////////////////////////////////////////////
     // here goes the perspective specific stuff
     /////////////////////////////////////////////
 
-    left->AddView("org.mitk.views.mlbtview");
     left->AddView("org.mitk.views.segmentation");
-    left->AddView("org.mitk.views.diffusionpreprocessing");
+    left->AddView("org.mitk.views.segmentationutilities");
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkSegmentationPerspective.h
similarity index 69%
rename from Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.h
rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkSegmentationPerspective.h
index c89a61672e..6be030c56a 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.h
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkSegmentationPerspective.h
@@ -1,36 +1,36 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
-#ifndef QmitkDwiRegistrationPerspective_H_
-#define QmitkDwiRegistrationPerspective_H_
+#ifndef QmitkSegmentationPerspective_H_
+#define QmitkSegmentationPerspective_H_
 
 #include <berryIPerspectiveFactory.h>
 
-class QmitkDwiRegistrationPerspective : public QObject, public berry::IPerspectiveFactory
+class QmitkSegmentationPerspective : public QObject, public berry::IPerspectiveFactory
 {
   Q_OBJECT
   Q_INTERFACES(berry::IPerspectiveFactory)
 
 public:
 
-  QmitkDwiRegistrationPerspective() {}
-  ~QmitkDwiRegistrationPerspective() {}
+  QmitkSegmentationPerspective() {}
+  ~QmitkSegmentationPerspective() {}
 
   void CreateInitialLayout(berry::IPageLayout::Pointer layout) override;
 };
 
-#endif /* QmitkFiberProcessingPerspective_H_ */
+#endif /* QmitkSegmentationPerspective_H_ */
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp
index 5c1b930cb7..fa8f61b734 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp
@@ -1,73 +1,75 @@
 /*===================================================================
 
 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 "mitkPluginActivator.h"
 
 #include "src/internal/Perspectives/QmitkDiffusionDefaultPerspective.h"
+#include "src/internal/Perspectives/QmitkSegmentationPerspective.h"
 
 #include "src/internal/QmitkDiffusionDicomImportView.h"
 #include "src/internal/QmitkDicomTractogramTagEditorView.h"
 #include "src/internal/QmitkControlVisualizationPropertiesView.h"
 
 #include "QmitkNodeDescriptorManager.h"
 #include "mitkNodePredicateDataType.h"
 #include "mitkNodePredicateProperty.h"
 #include "mitkNodePredicateIsDWI.h"
 #include <mitkDiffusionPropertyHelper.h>
 
 namespace mitk {
 
 void PluginActivator::start(ctkPluginContext* context)
 {
     BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionDefaultPerspective, context)
+    BERRY_REGISTER_EXTENSION_CLASS(QmitkSegmentationPerspective, context)
 
     BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionDicomImport, context)
     BERRY_REGISTER_EXTENSION_CLASS(QmitkDicomTractogramTagEditorView, context)
     BERRY_REGISTER_EXTENSION_CLASS(QmitkControlVisualizationPropertiesView, context)
 
             //            Q_UNUSED(context)
 
     QmitkNodeDescriptorManager* manager = QmitkNodeDescriptorManager::GetInstance();
 
     mitk::NodePredicateIsDWI::Pointer isDiffusionImage = mitk::NodePredicateIsDWI::New();
     QmitkNodeDescriptor* desc = new QmitkNodeDescriptor(QObject::tr("DiffusionImage"), QString(":/QmitkDiffusionImaging/DiffData24.png"), isDiffusionImage, manager);
     manager->AddDescriptor(desc);
 
     mitk::NodePredicateDataType::Pointer isTensorImage = mitk::NodePredicateDataType::New("TensorImage");
     manager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("TensorImage"), QString(":/QmitkDiffusionImaging/tensor.png"), isTensorImage, manager));
 
     mitk::NodePredicateDataType::Pointer isOdfImage = mitk::NodePredicateDataType::New("OdfImage");
     manager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("OdfImage"), QString(":/QmitkDiffusionImaging/odf.png"), isOdfImage, manager));
 
     mitk::NodePredicateDataType::Pointer isFiberBundle = mitk::NodePredicateDataType::New("FiberBundle");
     manager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("FiberBundle"), QString(":/QmitkDiffusionImaging/tractogram.png"), isFiberBundle, manager));
 
     mitk::NodePredicateDataType::Pointer isPeakImage = mitk::NodePredicateDataType::New("PeakImage");
     manager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PeakImage"), QString(":/QmitkDiffusionImaging/odf_peaks.png"), isPeakImage, manager));
 
 
     mitk::NodePredicateDataType::Pointer isConnectomicsNetwork = mitk::NodePredicateDataType::New("ConnectomicsNetwork");
     manager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("ConnectomicsNetwork"), QString(":/QmitkDiffusionImaging/ConnectomicsNetwork.png"), isConnectomicsNetwork, manager));
 
     mitk::NodePredicateDataType::Pointer isTractographyForestNetwork = mitk::NodePredicateDataType::New("TractographyForest");
     manager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("TractographyForest"), QString(":/QmitkDiffusionImaging/ml_tractogram.png"), isTractographyForestNetwork, manager));
 }
 
 void PluginActivator::stop(ctkPluginContext* context)
 {
     Q_UNUSED(context)
 }
 
 }
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake
index f1f9f6b993..2e6976a06e 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake
@@ -1,66 +1,47 @@
 set(SRC_CPP_FILES
   QmitkDiffusionImagingAppApplication.cpp
   QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
 )
 
 set(INTERNAL_CPP_FILES
   QmitkDiffusionApplicationPlugin.cpp
   QmitkDiffusionImagingAppIntroPart.cpp
   Perspectives/QmitkWelcomePerspective.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkWelcomeScreenViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/QmitkDiffusionImagingAppIntroPart.h
   src/internal/QmitkDiffusionApplicationPlugin.h
   src/QmitkDiffusionImagingAppApplication.h
   src/internal/Perspectives/QmitkWelcomePerspective.h
 )
 
 set(CACHED_RESOURCE_FILES
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
   plugin.xml
-  resources/icon_dicom.xpm
-  resources/diffusionimaging.png
-  resources/preprocessing.png
-  resources/Measurement_48.png
-  resources/volvis.png
-  resources/perspectives/diffusionimaging.png
-  resources/perspectives/icon_home.png
-  resources/perspectives/connectomics.png
-  resources/perspectives/dicomimport.png
-  resources/perspectives/preprocessingreconstruction.png
-  resources/perspectives/quantification.png
-  resources/perspectives/tbss.png
-  resources/perspectives/utilities.png
-  resources/perspectives/imageProcessing.png
-  resources/perspectives/registration.png
-  resources/perspectives/phantomData2.png
-  resources/perspectives/eye.png
-  resources/perspectives/registration.xpm
-  resources/perspectives/chart.png
-  resources/perspectives/preprocessing.png
+  resources/icon_home.png
 )
 
 set(QRC_FILES
 # uncomment the following line if you want to use Qt resources
   resources/welcome/QmitkWelcomeScreenView.qrc
   resources/org_mitk_gui_qt_diffusionimagingapp.qrc
 )
 
 # set(CPP_FILES)
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
index f3ed00e11e..e0b8a0b82e 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
   <extension point="org.blueberry.osgi.applications" id="org.mitk.qt.diffusionimagingapp">
     <application>
       <run class="QmitkDiffusionImagingAppApplication"/>
     </application>
   </extension>
 
   <extension id="diffusion" point="org.blueberry.core.runtime.products">
     <product name="MITK Diffusion" application="org.mitk.qt.diffusionimagingapp" />
   </extension>
 
   <extension point="org.blueberry.ui.intro">
     <intro id="org.mitk.qt.diffusionimagingappintro"
       class="QmitkDiffusionImagingAppIntroPart"
       role="editor"/>
     <introProductBinding
       productId="org.mitk.gui.qt.diffusionimagingapp.diffusion"
       introId="org.mitk.qt.diffusionimagingappintro"/>
   </extension>
 
   <extension point="org.blueberry.ui.perspectives">
     <perspective id="org.mitk.diffusionimagingapp.perspectives.welcome"
       name="Data Display"
       class="QmitkWelcomePerspective"
-      icon="resources/perspectives/icon_home.png"/>
+      icon="resources/icon_home.png"/>
   </extension>
 
 
   <extension point="org.blueberry.ui.preferencePages">
     <page
       id="org.blueberry.ui.preferencePages.Style"
       name="Themes"
       category="org.mitk.GeneralPreferencePage"
       class="berry::ExtensionFactory:stylePreferencePage">
       <keywordreference id="org.blueberry.ui.style"/>
     </page>
     <page
       id="org.blueberry.ui.preferencePages.Perspectives"
       name="Perspectives"
       category="org.mitk.GeneralPreferencePage"
       class="berry::ExtensionFactory:perspectivesPreferencePage">
       <keywordreference id="org.blueberry.ui.perspectives"/>
     </page>
   </extension>
 
 </plugin>
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/ImageProcessing_48.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/ImageProcessing_48.png
deleted file mode 100644
index b0244a0320..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/ImageProcessing_48.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/Measurement_48.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/Measurement_48.png
deleted file mode 100644
index 3907445ef6..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/Measurement_48.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/RigidRegistration.xpm b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/RigidRegistration.xpm
deleted file mode 100644
index 51a5f9c4bb..0000000000
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/RigidRegistration.xpm
+++ /dev/null
@@ -1,231 +0,0 @@
-/* XPM */
-static char *RigidRegistration___[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 177 2",
-"   c #6F5F67",
-".  c #735C62",
-"X  c #5B6B74",
-"o  c #577076",
-"O  c #587177",
-"+  c #5C747B",
-"@  c #5D797F",
-"#  c #796167",
-"$  c #71636B",
-"%  c #7F656B",
-"&  c #696872",
-"*  c #63747C",
-"=  c #9B4E61",
-"-  c #8A5662",
-";  c #A84D63",
-":  c #A55367",
-">  c #AA5167",
-",  c #A55569",
-"<  c #AB5368",
-"1  c #A45A6C",
-"2  c #AA5A6D",
-"3  c #AC5E71",
-"4  c #81656C",
-"5  c #8F6F77",
-"6  c #906D76",
-"7  c #8F7078",
-"8  c #94767D",
-"9  c #9B727C",
-"0  c #AE6375",
-"q  c #B3687A",
-"w  c #547B85",
-"e  c #5E7B82",
-"r  c #5E7D8C",
-"t  c #657981",
-"y  c #6C7F87",
-"u  c #6C7F88",
-"i  c #7B7486",
-"p  c #707388",
-"a  c #887A83",
-"s  c #9E7F87",
-"d  c #3E8B9E",
-"f  c #3B92A7",
-"g  c #3696AD",
-"h  c #3F98AE",
-"j  c #5E8088",
-"k  c #548797",
-"l  c #558698",
-"z  c #598B9C",
-"x  c #60858E",
-"c  c #6E848B",
-"v  c #73868E",
-"b  c #7A828D",
-"n  c #6C8391",
-"m  c #6A8F97",
-"M  c #7D8792",
-"N  c #758C94",
-"B  c #7B8D95",
-"V  c #748F9B",
-"C  c #7A8E9A",
-"Z  c #6D919A",
-"A  c #7A9097",
-"S  c #72939B",
-"D  c #7C949B",
-"F  c #7E989E",
-"G  c #548FA3",
-"H  c #4399AE",
-"J  c #4C9AAD",
-"K  c #5293A5",
-"L  c #5C95A5",
-"P  c #5597A9",
-"I  c #5499AA",
-"U  c #5B9BAB",
-"Y  c #459EB3",
-"T  c #5A9EB0",
-"R  c #6597A2",
-"E  c #6994A5",
-"W  c #6D9AA5",
-"Q  c #659CAB",
-"!  c #6C9CAB",
-"~  c #7296A5",
-"^  c #7499A3",
-"/  c #7A9CA5",
-"(  c #779BA9",
-")  c #45A0B7",
-"_  c #4BA1B6",
-"`  c #47A2B8",
-"'  c #4AA3B9",
-"]  c #4FA8BE",
-"[  c #56A1B4",
-"{  c #5CA1B3",
-"}  c #52A6BA",
-"|  c #5CA6B8",
-" . c #54A8BC",
-".. c #5CA9BC",
-"X. c #68A0AF",
-"o. c #7DA1A9",
-"O. c #63A1B3",
-"+. c #6EA7B7",
-"@. c #62A7B9",
-"#. c #63ABBD",
-"$. c #6BADBE",
-"%. c #74A2B0",
-"&. c #78A7B3",
-"*. c #70AEBE",
-"=. c #5AAEC2",
-"-. c #67B5C8",
-";. c #74B1C0",
-":. c #7EB5C2",
-">. c #7FBCCB",
-",. c #9F888D",
-"<. c #828C96",
-"1. c #928A92",
-"2. c #9C8990",
-"3. c #82959D",
-"4. c #8A959F",
-"5. c #81989F",
-"6. c #A2848B",
-"7. c #A2888E",
-"8. c #AE8E96",
-"9. c #A99297",
-"0. c #AD9399",
-"q. c #B2999F",
-"w. c #8497A0",
-"e. c #8E96A1",
-"r. c #829CA2",
-"t. c #8A9DA5",
-"y. c #8C9FA8",
-"u. c #9097A2",
-"i. c #9B9EA8",
-"p. c #B59EA4",
-"a. c #8AA0A7",
-"s. c #83A4AC",
-"d. c #8DA2AA",
-"f. c #91A4AC",
-"g. c #98A0AA",
-"h. c #91A8AF",
-"j. c #80A7B6",
-"k. c #87A9B1",
-"l. c #8CAAB2",
-"z. c #94ACB3",
-"x. c #9AACB4",
-"c. c #87B2BD",
-"v. c #95B1B7",
-"b. c #98B1B7",
-"n. c #94B2B9",
-"m. c #98B2B8",
-"M. c #9FB8BF",
-"N. c #A0B5BC",
-"B. c #A1B9BF",
-"V. c #BCB1B8",
-"C. c #CAB3B9",
-"Z. c #8FBAC5",
-"A. c #93BCC7",
-"S. c #9EBAC1",
-"D. c #A3BDC3",
-"F. c #A8BEC5",
-"G. c #9DC0C9",
-"H. c #83C2D1",
-"J. c #A7C0C6",
-"K. c #A8C1C7",
-"L. c #A4C3CA",
-"P. c #AEC7CD",
-"I. c #A5CFDB",
-"U. c #B6CDD4",
-"Y. c #B9D1D7",
-"T. c #BAD5DB",
-"R. c #BFD9DF",
-"E. c #B0D8E2",
-"W. c #BEDFE7",
-"Q. c #C2C1C9",
-"!. c #DBC4CA",
-"~. c #DDC8CE",
-"^. c #E0C9CF",
-"/. c #C3DDE3",
-"(. c #C7E0E7",
-"). c #CEE7ED",
-"_. c None",
-/* pixels */
-"3 3 3 3 3 3 3 3 3 ; : = = = = = = = = < 3 2 2 2 2 2 2 2 ; , , , , , , , , : _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s . . . . . . . . 4 6.p.p.p.p.p.p.p.p.8 7.,.7.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . 4 6.p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . % 6.p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s . . . . . . . . % s p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.,.# . . . . . . . % 6.p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.D 1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . % s p.p.p.p.p.p.p.q.8 ,.,.,.7.1.L U I i _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . % ,.p.p.p.p.p.p.p.p.8 ,.,.S P U F r.r.K _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s . . . . . . . . % 6.p.p.p.p.p.p.p.p.a L P W o.5.5.r.r.U _._._._._._._._._._.",
-"< s s s s s s s s 9 6 8 5 5 5 7 5 5 5 6 7 5 5 5 7 7 n I K ^ r.r.F a.a.F a.F H _._._._._._._._._.",
-"q !.!.!.!.!.!.!.!.6.9.p.q.p.p.p.q.p.6.4 # . . $ k I &.m.A 3.r.r.a.F r.r.F r.J _._._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.6.9.p.p.p.p.p.p.p.7.4 . * K T v.b.b.b.h.t.r.r.r.r.r.r./ r.o.f _._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.6.0.p.p.p.p.p.p.p.,.k K %.m.m.m.m.b.m.b.a.F r.r.r.r.r.r.r.r.H _._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.6.q.p.p.p.p.p.g.O.{ S A m.m.m.m.m.m.m.b.d.w.r.r.r.r.r.r.r.r.R _._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.7.8.p.p.p.%.{ X.r.r.r.v z.m.m.m.b.m.m.b.b.t.5.r.r.r.5./ B Z ^ ` _._._._._._._.",
-"q ^.^.^.^.^.^.^.^.7.8.i.O.O.( r.r.r.r.r.N F b.m.m.m.m.m.b.b.d.r.r.r.5.5.t.4.v.P.;._._._._._._._.",
-"q ^.^.^.^.^.~.~.~.E T X.a.5.a.F r.r.r.r.5.v b.b.m.b.m.m.m.b.v.5.3.5.d.h.D.P.P.P.P._ _._._._._._.",
-"q ^.^.^.^.^.Q.*.$.A.P.r.F / F a.r.r.r.r.r.N a.b.m.m.m.m.m.z.d.f.f.x.P.P.P.P.P.P.P.#._._._._._._.",
-"< 8.0.0.^ [ *.P.P.P.P.a.5.a.r.r./ r.r.r.r.5.B b.m.m.b.a.3.3.5.5.5.P.P.P.P.P.P.P.P.L.' _._._._._.",
-"0 q.( @.Z.P.P.P.P.P.P.J.D F r.r.r.r.r.r.r.r.w.h.z.r.w.r.5.r.r.r.5.h.P.P.P.P.P.P.P.P..._._._._._.",
-"0 C.x.:.P.P.P.P.P.P.P.P.t.5.r.r.r.r.r.r.r.r.t.d.d.d.r.r.r.r.r.r.a.5.P.P.P.P.P.P.P.P.Z._._._._._.",
-"0 C.C.@.P.P.P.P.P.P.P.P.m.4.r.r.r.r.r.5.a.d.d.d.r.r.r.r.r.r.r.r.5.5.m.P.P.P.P.P.P.P.P.} _._._._.",
-"0 C.C.j.G.P.P.P.P.P.P.P.P.5.5.r.r.5.3.3.d.h.b.a.a.r.r.r.r.r.r.r.F 5.a.P.P.P.P.P.P.P.l.{ _._._._.",
-"0 C.C.C.#.P.P.P.P.P.P.P.P.h.5.5.3.3.r.v.b.b.m.h.d.r.r.r.r.r.r.r.a.5.3.L.P.P.P.M.s.^ Z S H _._._.",
-"0 C.C.C.+.L.P.P.P.P.P.P.m.t.<.3.d.m.n.m.m.m.b.m.d.r.r.r.r.r.r.r.r.r.5.d.P.h.o.Z S F r.r.I _._._.",
-"0 C.C.C.C.$.P.P.P.P.f.3.t.m.h.5.m.m.m.b.m.m.m.m.d.d.r.r.r.r.r.r.r.r.r.3.3.b D 5.r.r.r.r./ Y _._.",
-"0 C.C.C.C.@.P.D.h.3.d.P.).)./.<.v.m.m.m.m.b.m.m.b.d.w.r.r.r.r.r.5.4.5.3.A r.r.r.r.r.r.r.r.J _._.",
-"2 0.0.0.0.e.Q t.m.R.).).).).).f./ m.m.m.m.m.m.m.b.r.t.5.r.r.5.D 3.f.P.m.M r.r.r./ r.r.r.r.^ H _.",
-"= 4 4 4 4 4 T ).).).).).).).).U.3.b.m.m.m.m.m.b.b.z.v 5.D 5.d.M.P.P.P.P.5.D r.r.r.r.r.r.r.r.H _.",
-"= . . . . . r I.).).).).).).).).h.d.m.m.b.m.m.m.z.N X * d.P.P.P.P.P.P.P.b.M r.r.r.r.r.r.r.r.R _.",
-"= . . . . . . | ).).).).).).).).K.d.m.m.m.m.r.c + t N t P.P.P.P.P.P.P.P.P.<.F r.r.r.r.r.r.r.r.H ",
-"= . . . . . . z (.).).).).).).).).f.h.z.A * * c 5.r.r.* f.P.P.P.P.P.P.P.P.e.S r.r.r.r.r.F S Z Y ",
-"=   . . . . .   $.).).).).).).).).m.3.y * B r.r.r.r.r.N A P.P.P.P.P.P.P.P.K.Z a./ 5.S m S k.B...",
-"=   . . . . . . P ).).).).).(.F.x.f.3.D r.r.r.r.r.r.F a.v M.P.P.P.P.P.P.P.P.s.N S Z o.v.P.P.P...",
-"= . . . . . . . & >.).).Y.N.h.h.m.P.d.N r.r.r.r.F a.o.5.S f.P.P.P.P.P.P.P.x./ _.s.M.P.P.P.P.P...",
-"= . . . . . . . . T F.x.y.h.F.P.P.P.N.c r.r.r.r.o.F a.5.5.4.J.P.P.P.K.h.d.4.J.k.b.P.P.P.P.P.P...",
-"= - - - - - - - - p ~ x.P.P.P.P.P.P.P.A N r.r.r.5.r.r.r.r.A d.P.m.g.4.z.U.).).P.o.P.P.P.P.P.P.#.",
-"_._._._._._._._._._.[ P.P.P.P.P.P.P.P.m.N r.r.r.r.r.r.F r.F S D a.N.(.).).).).).o.B.P.P.P.P.P...",
-"_._._._._._._._._._.Y G.P.P.P.P.P.P.P.P.S F r.r.r.r.r.D S Z ^ l.).).).).).).).).S.s.P.P.P.P.P...",
-"_._._._._._._._._._._.#.P.P.P.P.P.P.P.P.l.Z r.r.5.S Z o.l.K.m.o.).).).).).).).).(./ P.P.P.P.P...",
-"_._._._._._._._._._._.` K.P.P.P.P.P.P.P.P.Z A Z Z s.M.P.P.P.P./ P.).).).).).).).).n.h.P.P.P.L.' ",
-"_._._._._._._._._._._._.;.P.P.P.P.P.P.P.l.W ^ k.K.P.P.P.P.P.P.l.l.).).).).).).).).T.^ P.Z...` _.",
-"_._._._._._._._._._._._.` P.P.P.P.S.s.m j @ S P.P.P.P.P.P.P.P.P.^ T.).).).).).).).)..._ _._._._.",
-"_._._._._._._._._._._._._.:.P.n.o.x e + o o j v.P.P.P.P.P.P.P.P.k.n.).).).).).E.-.] _._._._._._.",
-"_._._._._._._._._._._._._.` Z j @ o o o o o + / P.P.P.P.P.P.P.P.J.^ /.).).H.=._ _._._._._._._._.",
-"_._._._._._._._._._._._._.g w o o o o o o o o x M.P.P.P.P.P.P.P.P.s.c.-.] _._._._._._._._._._._.",
-"_._._._._._._._._._._._._._.d o o o o o o o O e o.P.P.P.P.P.P.P.;.[ _._._._._._._._._._._._._._.",
-"_._._._._._._._._._._._._._.f d d d d d d d d d h ............' _._._._._._._._._._._._._._._._."
-};
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png
deleted file mode 100644
index 06ebd38cb0..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png
deleted file mode 100644
index 9582dd772d..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_dicom.xpm b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_dicom.xpm
deleted file mode 100644
index d35e45238c..0000000000
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_dicom.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char *Dicom___[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 17 1",
-"  c #00AAD1",
-". c #00A9D2",
-"X c #00A8D3",
-"o c #00A9D3",
-"O c #00AAD2",
-"+ c #00ABD2",
-"@ c #00AAD3",
-"# c #00ABD3",
-"$ c #00ACD3",
-"% c #00A9D4",
-"& c #00A9D5",
-"* c #00AAD4",
-"= c #00ABD4",
-"- c #00AAD5",
-"; c #00ABD5",
-": c #00ACD4",
-"> c None",
-/* pixels */
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>*>>>>>>>>>>>>>>>>>>",
-">o@@@@*@>>>>@o>>>>>*Oo*#>>*@%O@o>>>>@@%>>>>>@@>>",
-">O@>>>@@@>>>@o>>o.@>>>>>>@O=>>*@#>>>Oo@>>>>+o@o>",
-">O@>>>>>#@>>@o>>+@>>>>>>>*->>>>>@o>>@@@>>>>@@@+>",
-">O@>>>>>%@>>@o>##>>>>>>>o@>>>>>>*%>>@@@.>>>@-@#>",
-">O@>>>>>o@>>@o>@@>>>>>>>=@>>>>>>+@>>O@**>>:@>@@>",
-">O@>>>>>@@>>@o>@@>>>>>>>o*>>>>>>#@>>OX>@>>@O>@@>",
-">O@>>>>>OO>>@o>@@>>>>>>>#@>>>>>>@O>>@+>@O>@@>o*>",
-">O@>>>>>==>>@o>+@>>>>>>>*.>>>>>>@@>>@@> O+@>>#@>",
-">O@>>>>*@>>>@o>>@%>>>>>>>O@>>>>#@->>@>>>***>>@*>",
-">O#@$=@@&>>>@o>>+@@O*=O>>=@.o #O@>>O@>>>@@>>>@@>",
-">O***@->>>>>#->>>>OO@oo>>>>@O+@@>>>;@>>>oO>>>@O>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-};
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/icon_home.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_home.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/icon_home.png
rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_home.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_vesseltreesegmentation.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_vesseltreesegmentation.png
deleted file mode 100644
index 40e5728730..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_vesseltreesegmentation.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/mintLogo.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/mintLogo.png
deleted file mode 100644
index c88813fd52..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/mintLogo.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc
index 086feb2a7e..d41ce744a5 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc
@@ -1,6 +1,3 @@
-<!DOCTYPE RCC><RCC version="1.0">
- <qresource prefix="/org.mitk.gui.qt.diffusionimagingapp">
-     <file>app-icon.png</file>	 
-	 <file>mintLogo.png</file>
- </qresource>
- </RCC>
+<RCC>
+    <qresource prefix="/org.mitk.gui.qt.diffusionimagingapp"/>
+</RCC>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/chart.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/chart.png
deleted file mode 100644
index 322dae0037..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/chart.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/connectomics.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/connectomics.png
deleted file mode 100644
index f434f12741..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/connectomics.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/dicomimport.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/dicomimport.png
deleted file mode 100644
index 1bb5f7ea4a..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/dicomimport.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/diffusionimaging.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/diffusionimaging.png
deleted file mode 100644
index 9582dd772d..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/diffusionimaging.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/eye.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/eye.png
deleted file mode 100644
index 6e6e216171..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/eye.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/imageProcessing.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/imageProcessing.png
deleted file mode 100644
index c15f94f857..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/imageProcessing.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/imageProcessing2.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/imageProcessing2.png
deleted file mode 100644
index 0e1c876590..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/imageProcessing2.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/phantomData1.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/phantomData1.png
deleted file mode 100644
index f5463c2150..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/phantomData1.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/phantomData2.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/phantomData2.png
deleted file mode 100644
index b01d5561bd..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/phantomData2.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessing.png
deleted file mode 100644
index dc91cb9c2c..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessing.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessingreconstruction.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessingreconstruction.png
deleted file mode 100644
index a89e20560d..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessingreconstruction.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/quantification.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/quantification.png
deleted file mode 100644
index beb711dc03..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/quantification.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/registration.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/registration.png
deleted file mode 100644
index b3d11132b6..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/registration.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/registration.xpm b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/registration.xpm
deleted file mode 100644
index 51a5f9c4bb..0000000000
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/registration.xpm
+++ /dev/null
@@ -1,231 +0,0 @@
-/* XPM */
-static char *RigidRegistration___[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 177 2",
-"   c #6F5F67",
-".  c #735C62",
-"X  c #5B6B74",
-"o  c #577076",
-"O  c #587177",
-"+  c #5C747B",
-"@  c #5D797F",
-"#  c #796167",
-"$  c #71636B",
-"%  c #7F656B",
-"&  c #696872",
-"*  c #63747C",
-"=  c #9B4E61",
-"-  c #8A5662",
-";  c #A84D63",
-":  c #A55367",
-">  c #AA5167",
-",  c #A55569",
-"<  c #AB5368",
-"1  c #A45A6C",
-"2  c #AA5A6D",
-"3  c #AC5E71",
-"4  c #81656C",
-"5  c #8F6F77",
-"6  c #906D76",
-"7  c #8F7078",
-"8  c #94767D",
-"9  c #9B727C",
-"0  c #AE6375",
-"q  c #B3687A",
-"w  c #547B85",
-"e  c #5E7B82",
-"r  c #5E7D8C",
-"t  c #657981",
-"y  c #6C7F87",
-"u  c #6C7F88",
-"i  c #7B7486",
-"p  c #707388",
-"a  c #887A83",
-"s  c #9E7F87",
-"d  c #3E8B9E",
-"f  c #3B92A7",
-"g  c #3696AD",
-"h  c #3F98AE",
-"j  c #5E8088",
-"k  c #548797",
-"l  c #558698",
-"z  c #598B9C",
-"x  c #60858E",
-"c  c #6E848B",
-"v  c #73868E",
-"b  c #7A828D",
-"n  c #6C8391",
-"m  c #6A8F97",
-"M  c #7D8792",
-"N  c #758C94",
-"B  c #7B8D95",
-"V  c #748F9B",
-"C  c #7A8E9A",
-"Z  c #6D919A",
-"A  c #7A9097",
-"S  c #72939B",
-"D  c #7C949B",
-"F  c #7E989E",
-"G  c #548FA3",
-"H  c #4399AE",
-"J  c #4C9AAD",
-"K  c #5293A5",
-"L  c #5C95A5",
-"P  c #5597A9",
-"I  c #5499AA",
-"U  c #5B9BAB",
-"Y  c #459EB3",
-"T  c #5A9EB0",
-"R  c #6597A2",
-"E  c #6994A5",
-"W  c #6D9AA5",
-"Q  c #659CAB",
-"!  c #6C9CAB",
-"~  c #7296A5",
-"^  c #7499A3",
-"/  c #7A9CA5",
-"(  c #779BA9",
-")  c #45A0B7",
-"_  c #4BA1B6",
-"`  c #47A2B8",
-"'  c #4AA3B9",
-"]  c #4FA8BE",
-"[  c #56A1B4",
-"{  c #5CA1B3",
-"}  c #52A6BA",
-"|  c #5CA6B8",
-" . c #54A8BC",
-".. c #5CA9BC",
-"X. c #68A0AF",
-"o. c #7DA1A9",
-"O. c #63A1B3",
-"+. c #6EA7B7",
-"@. c #62A7B9",
-"#. c #63ABBD",
-"$. c #6BADBE",
-"%. c #74A2B0",
-"&. c #78A7B3",
-"*. c #70AEBE",
-"=. c #5AAEC2",
-"-. c #67B5C8",
-";. c #74B1C0",
-":. c #7EB5C2",
-">. c #7FBCCB",
-",. c #9F888D",
-"<. c #828C96",
-"1. c #928A92",
-"2. c #9C8990",
-"3. c #82959D",
-"4. c #8A959F",
-"5. c #81989F",
-"6. c #A2848B",
-"7. c #A2888E",
-"8. c #AE8E96",
-"9. c #A99297",
-"0. c #AD9399",
-"q. c #B2999F",
-"w. c #8497A0",
-"e. c #8E96A1",
-"r. c #829CA2",
-"t. c #8A9DA5",
-"y. c #8C9FA8",
-"u. c #9097A2",
-"i. c #9B9EA8",
-"p. c #B59EA4",
-"a. c #8AA0A7",
-"s. c #83A4AC",
-"d. c #8DA2AA",
-"f. c #91A4AC",
-"g. c #98A0AA",
-"h. c #91A8AF",
-"j. c #80A7B6",
-"k. c #87A9B1",
-"l. c #8CAAB2",
-"z. c #94ACB3",
-"x. c #9AACB4",
-"c. c #87B2BD",
-"v. c #95B1B7",
-"b. c #98B1B7",
-"n. c #94B2B9",
-"m. c #98B2B8",
-"M. c #9FB8BF",
-"N. c #A0B5BC",
-"B. c #A1B9BF",
-"V. c #BCB1B8",
-"C. c #CAB3B9",
-"Z. c #8FBAC5",
-"A. c #93BCC7",
-"S. c #9EBAC1",
-"D. c #A3BDC3",
-"F. c #A8BEC5",
-"G. c #9DC0C9",
-"H. c #83C2D1",
-"J. c #A7C0C6",
-"K. c #A8C1C7",
-"L. c #A4C3CA",
-"P. c #AEC7CD",
-"I. c #A5CFDB",
-"U. c #B6CDD4",
-"Y. c #B9D1D7",
-"T. c #BAD5DB",
-"R. c #BFD9DF",
-"E. c #B0D8E2",
-"W. c #BEDFE7",
-"Q. c #C2C1C9",
-"!. c #DBC4CA",
-"~. c #DDC8CE",
-"^. c #E0C9CF",
-"/. c #C3DDE3",
-"(. c #C7E0E7",
-"). c #CEE7ED",
-"_. c None",
-/* pixels */
-"3 3 3 3 3 3 3 3 3 ; : = = = = = = = = < 3 2 2 2 2 2 2 2 ; , , , , , , , , : _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s . . . . . . . . 4 6.p.p.p.p.p.p.p.p.8 7.,.7.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . 4 6.p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . % 6.p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s . . . . . . . . % s p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.,.1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.,.# . . . . . . . % 6.p.p.p.p.p.p.p.p.8 ,.,.,.,.,.,.,.D 1 _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . % s p.p.p.p.p.p.p.q.8 ,.,.,.7.1.L U I i _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s # . . . . . . . % ,.p.p.p.p.p.p.p.p.8 ,.,.S P U F r.r.K _._._._._._._._._._.",
-"0 C.C.C.C.C.C.C.C.s . . . . . . . . % 6.p.p.p.p.p.p.p.p.a L P W o.5.5.r.r.U _._._._._._._._._._.",
-"< s s s s s s s s 9 6 8 5 5 5 7 5 5 5 6 7 5 5 5 7 7 n I K ^ r.r.F a.a.F a.F H _._._._._._._._._.",
-"q !.!.!.!.!.!.!.!.6.9.p.q.p.p.p.q.p.6.4 # . . $ k I &.m.A 3.r.r.a.F r.r.F r.J _._._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.6.9.p.p.p.p.p.p.p.7.4 . * K T v.b.b.b.h.t.r.r.r.r.r.r./ r.o.f _._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.6.0.p.p.p.p.p.p.p.,.k K %.m.m.m.m.b.m.b.a.F r.r.r.r.r.r.r.r.H _._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.6.q.p.p.p.p.p.g.O.{ S A m.m.m.m.m.m.m.b.d.w.r.r.r.r.r.r.r.r.R _._._._._._._._.",
-"q ^.^.^.^.^.^.^.^.7.8.p.p.p.%.{ X.r.r.r.v z.m.m.m.b.m.m.b.b.t.5.r.r.r.5./ B Z ^ ` _._._._._._._.",
-"q ^.^.^.^.^.^.^.^.7.8.i.O.O.( r.r.r.r.r.N F b.m.m.m.m.m.b.b.d.r.r.r.5.5.t.4.v.P.;._._._._._._._.",
-"q ^.^.^.^.^.~.~.~.E T X.a.5.a.F r.r.r.r.5.v b.b.m.b.m.m.m.b.v.5.3.5.d.h.D.P.P.P.P._ _._._._._._.",
-"q ^.^.^.^.^.Q.*.$.A.P.r.F / F a.r.r.r.r.r.N a.b.m.m.m.m.m.z.d.f.f.x.P.P.P.P.P.P.P.#._._._._._._.",
-"< 8.0.0.^ [ *.P.P.P.P.a.5.a.r.r./ r.r.r.r.5.B b.m.m.b.a.3.3.5.5.5.P.P.P.P.P.P.P.P.L.' _._._._._.",
-"0 q.( @.Z.P.P.P.P.P.P.J.D F r.r.r.r.r.r.r.r.w.h.z.r.w.r.5.r.r.r.5.h.P.P.P.P.P.P.P.P..._._._._._.",
-"0 C.x.:.P.P.P.P.P.P.P.P.t.5.r.r.r.r.r.r.r.r.t.d.d.d.r.r.r.r.r.r.a.5.P.P.P.P.P.P.P.P.Z._._._._._.",
-"0 C.C.@.P.P.P.P.P.P.P.P.m.4.r.r.r.r.r.5.a.d.d.d.r.r.r.r.r.r.r.r.5.5.m.P.P.P.P.P.P.P.P.} _._._._.",
-"0 C.C.j.G.P.P.P.P.P.P.P.P.5.5.r.r.5.3.3.d.h.b.a.a.r.r.r.r.r.r.r.F 5.a.P.P.P.P.P.P.P.l.{ _._._._.",
-"0 C.C.C.#.P.P.P.P.P.P.P.P.h.5.5.3.3.r.v.b.b.m.h.d.r.r.r.r.r.r.r.a.5.3.L.P.P.P.M.s.^ Z S H _._._.",
-"0 C.C.C.+.L.P.P.P.P.P.P.m.t.<.3.d.m.n.m.m.m.b.m.d.r.r.r.r.r.r.r.r.r.5.d.P.h.o.Z S F r.r.I _._._.",
-"0 C.C.C.C.$.P.P.P.P.f.3.t.m.h.5.m.m.m.b.m.m.m.m.d.d.r.r.r.r.r.r.r.r.r.3.3.b D 5.r.r.r.r./ Y _._.",
-"0 C.C.C.C.@.P.D.h.3.d.P.).)./.<.v.m.m.m.m.b.m.m.b.d.w.r.r.r.r.r.5.4.5.3.A r.r.r.r.r.r.r.r.J _._.",
-"2 0.0.0.0.e.Q t.m.R.).).).).).f./ m.m.m.m.m.m.m.b.r.t.5.r.r.5.D 3.f.P.m.M r.r.r./ r.r.r.r.^ H _.",
-"= 4 4 4 4 4 T ).).).).).).).).U.3.b.m.m.m.m.m.b.b.z.v 5.D 5.d.M.P.P.P.P.5.D r.r.r.r.r.r.r.r.H _.",
-"= . . . . . r I.).).).).).).).).h.d.m.m.b.m.m.m.z.N X * d.P.P.P.P.P.P.P.b.M r.r.r.r.r.r.r.r.R _.",
-"= . . . . . . | ).).).).).).).).K.d.m.m.m.m.r.c + t N t P.P.P.P.P.P.P.P.P.<.F r.r.r.r.r.r.r.r.H ",
-"= . . . . . . z (.).).).).).).).).f.h.z.A * * c 5.r.r.* f.P.P.P.P.P.P.P.P.e.S r.r.r.r.r.F S Z Y ",
-"=   . . . . .   $.).).).).).).).).m.3.y * B r.r.r.r.r.N A P.P.P.P.P.P.P.P.K.Z a./ 5.S m S k.B...",
-"=   . . . . . . P ).).).).).(.F.x.f.3.D r.r.r.r.r.r.F a.v M.P.P.P.P.P.P.P.P.s.N S Z o.v.P.P.P...",
-"= . . . . . . . & >.).).Y.N.h.h.m.P.d.N r.r.r.r.F a.o.5.S f.P.P.P.P.P.P.P.x./ _.s.M.P.P.P.P.P...",
-"= . . . . . . . . T F.x.y.h.F.P.P.P.N.c r.r.r.r.o.F a.5.5.4.J.P.P.P.K.h.d.4.J.k.b.P.P.P.P.P.P...",
-"= - - - - - - - - p ~ x.P.P.P.P.P.P.P.A N r.r.r.5.r.r.r.r.A d.P.m.g.4.z.U.).).P.o.P.P.P.P.P.P.#.",
-"_._._._._._._._._._.[ P.P.P.P.P.P.P.P.m.N r.r.r.r.r.r.F r.F S D a.N.(.).).).).).o.B.P.P.P.P.P...",
-"_._._._._._._._._._.Y G.P.P.P.P.P.P.P.P.S F r.r.r.r.r.D S Z ^ l.).).).).).).).).S.s.P.P.P.P.P...",
-"_._._._._._._._._._._.#.P.P.P.P.P.P.P.P.l.Z r.r.5.S Z o.l.K.m.o.).).).).).).).).(./ P.P.P.P.P...",
-"_._._._._._._._._._._.` K.P.P.P.P.P.P.P.P.Z A Z Z s.M.P.P.P.P./ P.).).).).).).).).n.h.P.P.P.L.' ",
-"_._._._._._._._._._._._.;.P.P.P.P.P.P.P.l.W ^ k.K.P.P.P.P.P.P.l.l.).).).).).).).).T.^ P.Z...` _.",
-"_._._._._._._._._._._._.` P.P.P.P.S.s.m j @ S P.P.P.P.P.P.P.P.P.^ T.).).).).).).).)..._ _._._._.",
-"_._._._._._._._._._._._._.:.P.n.o.x e + o o j v.P.P.P.P.P.P.P.P.k.n.).).).).).E.-.] _._._._._._.",
-"_._._._._._._._._._._._._.` Z j @ o o o o o + / P.P.P.P.P.P.P.P.J.^ /.).).H.=._ _._._._._._._._.",
-"_._._._._._._._._._._._._.g w o o o o o o o o x M.P.P.P.P.P.P.P.P.s.c.-.] _._._._._._._._._._._.",
-"_._._._._._._._._._._._._._.d o o o o o o o O e o.P.P.P.P.P.P.P.;.[ _._._._._._._._._._._._._._.",
-"_._._._._._._._._._._._._._.f d d d d d d d d d h ............' _._._._._._._._._._._._._._._._."
-};
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tbss.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tbss.png
deleted file mode 100644
index 61f1eef09e..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tbss.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/utilities.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/utilities.png
deleted file mode 100644
index 0717ebaf45..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/utilities.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/utility.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/utility.png
deleted file mode 100644
index 2470fbd7de..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/utility.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/preprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/preprocessing.png
deleted file mode 100644
index d7564ca333..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/preprocessing.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/segmentation.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/segmentation.png
deleted file mode 100644
index a3f7bd9f27..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/segmentation.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/volvis.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/volvis.png
deleted file mode 100644
index b560f32dbd..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/volvis.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc
index 79affa1245..65bb011704 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc
@@ -1,36 +1,36 @@
 <RCC>
     <qresource prefix="/org.mitk.gui.qt.welcomescreen">
         <file>style.css</file>
         <file>function.js</file>
         <file>pics/background.jpg</file>
         <file>pics/popup_bttn_close.png</file>
         <file>pics/experimental.png</file>
         <file>pics/button_mitka.png</file>
         <file>pics/button_mitk.png</file>
         <file>mitkdiffusionimagingappwelcomeview.html</file>
         <file>pics/01adicomimport.png</file>
         <file>pics/01dicomimport.png</file>
         <file>pics/02apreprocessingreconstruction.png</file>
         <file>pics/02preprocessingreconstruction.png</file>
         <file>pics/03aquantification.png</file>
         <file>pics/03quantification.png</file>
         <file>pics/04atractography.png</file>
         <file>pics/04tractography.png</file>
-        <file>pics/05atbss.png</file>
-        <file>pics/05tbss.png</file>
         <file>pics/06aconnectomics.png</file>
         <file>pics/06connectomics.png</file>
         <file>pics/07aivim.png</file>
         <file>pics/07ivim.png</file>
         <file>pics/08avolumevisualization.png</file>
         <file>pics/08volumevisualization.png</file>
         <file>pics/11asegmentation.png</file>
         <file>pics/11segmentation.png</file>
         <file>pics/12aregistration.png</file>
         <file>pics/12registration.png</file>
         <file>pics/13autilities.png</file>
         <file>pics/13utilities.png</file>
         <file>pics/10softwarephantoms.png</file>
         <file>pics/10asoftwarephantoms.png</file>
+        <file>pics/05afiberprocessing.png</file>
+        <file>pics/05fiberprocessing.png</file>
     </qresource>
 </RCC>
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 06fad44eb8..c601d7f0a6 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js
@@ -1,317 +1,320 @@
 // 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("Preprocessing and Reconstruction",
+var moduleNames = new Array(
+                            "Preprocessing",
+                            "ODF Reconstruction/Signal Modelling",
+                            "Diffusion Indices",
                             "Tractography",
+                            "Fiber Processing",
                             "Connectomics",
                             "Fiberfox",
-//                            "Registration",
                             "IVIM",
-                            "Image Processing",
-                            "Visualization",
-                            "Utilities",
+                            "Segmentation",
                             "MITK Downloads & News");
 
 // add the MITK-link to your module
-var moduleLinks = new Array("mitk://mitk.perspectives/org.mitk.perspectives.reconstruction1?clear=false",
+var moduleLinks = new Array(
+                            "mitk://mitk.perspectives/org.mitk.perspectives.dwipreprocessing?clear=false",
+                            "mitk://mitk.perspectives/org.mitk.perspectives.reconstruction1?clear=false",
+                            "mitk://mitk.perspectives/org.mitk.perspectives.quantification?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.tractography2?clear=false",
+                            "mitk://mitk.perspectives/org.mitk.perspectives.fiberprocessings?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.connectomics?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.syntheticdata?clear=false",
                             "mitk://mitk.perspectives/org.mitk.perspectives.ivim?clear=false",
-                            "",
-                            "",
-                            "",
-//                            "",
-//                            "",
+                            "mitk://mitk.perspectives/org.mitk.perspectives.segmentation?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("02preprocessingreconstruction.png",
-//                             "03quantification.png",
+var picFilenames = new Array(
+                             "12registration.png",
+                             "02preprocessingreconstruction.png",
+                             "03quantification.png",
                              "04tractography.png",
+                             "05fiberprocessing.png",
                              "06connectomics.png",
                              "10softwarephantoms.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("02apreprocessingreconstruction.png",
-//                             "03aquantification.png",
+var aniFilenames = new Array(
+                             "12aregistration.png",
+                             "02apreprocessingreconstruction.png",
+                             "03aquantification.png",
                              "04atractography.png",
+                             "05afiberprocessing.png",
                              "06aconnectomics.png",
                              "10asoftwarephantoms.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,
+var experimental = new Array(
+                             false,
+                             false,
                              false,
                              false,
                              false,
                              false,
                              false,
                              false,
-//                             false,
-//                             false,
                              false,
                              false);
 
+//"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.",
+
 // add the description for your module. The description is displayed in a PopUp-window.
-var moduleDescriptions = new Array("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 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 moduleDescriptions = new Array(
+            "You can use MITK Diffusion to preprocess diffusion-weighted images using image registration, head-motion correction, denoising and much more.",
+            "MITK provides methods to estimate diffusion tensors or Q-balls using different reconstruction methods.",
+            "MITK allows the calculation of different scalar measures for raw diffusion-weighted images (MD, ADC), tensors (Fractional Anisotropy, Relative Anisotropy, Axial Diffusivity, Radial Diffusivity) or ODFs (Generalized Fractional Anisotropy).",
+            "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.",
+            "The results obtained with any fiber tractography method can be postprocessed using tract dissection, filtering, clustering, coloring or SIFT2-like fitting methods.",
+            "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.",
+            "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.",
+            "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));
 //    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(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.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 285410692b..5bf2460712 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html
@@ -1,44 +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 (beta release)!</h1>
+        <h1>Welcome to MITK Diffusion!</h1>
 
         <!-- PopUps with module description generated by js are placed in here -->
         <div id="popupAnchor"></div>
 
         <div id="welcomeText" align="justify">
           MITK Diffusion is the diffusion-weighted MR image processing application 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.
           <br/>
-          This is a beta release based on the current master branch of MITK that features cutting edge developments and has not been tested extensively! The next stable release of this application will be based on the next stable release of MITK. Many but not all modules available in MITK are included in this beta release. If you are missing a feature we recommend to <a href="http://docs.mitk.org/nightly/BuildInstructionsPage.html">build MITK Diffusion from source</a>.
-          <br/>
           To get started, select one of the perspectives in the toolbar above. If you hover over an icon the tooltip will tell you what tools and algorithms are provided in the respective perspective. If you want to brows all available views (tabs that provide a certain functionality), click on the "View Navigator" icon in the toolbar. If you need more information about a view, open it, select it with your mouse and press "F1". For even more information, please also visit our website <a href="http://mitk.org">mitk.org</a> or have a look at the <a href="mitk://mitk.perspectives/org.blueberry.perspectives.help?clear=true">help perspective</a>.
           <br/>
           If you encounter any bugs, please report them in our <a href="https://phabricator.mitk.org/maniphest/task/edit/form/21/">bugtracking system</a> or use the MITK-users <a href="http://mitk.org/wiki/MITK_Mailinglist">mailing list</a>. We are grateful for any feedback!</br>
 
-<br/><br/><b>Features:</b><br/><br/>
+<br/><br/><b>Features:</b><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/resources/welcome/pics/03aquantification.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03aquantification.png
index 5903175c5b..c617cd5a16 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03aquantification.png and b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03aquantification.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png
index 2b8d5c5210..174746082a 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png and b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png
index 7bd6ae8059..93d07f2f1d 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png and b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png
index 42ac4c6730..f9a7c44521 100644
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png and b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05afiberprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05afiberprocessing.png
new file mode 100644
index 0000000000..dc7c89eb34
Binary files /dev/null and b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05afiberprocessing.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05atbss.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05atbss.png
deleted file mode 100644
index 4b6a461936..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05atbss.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05fiberprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05fiberprocessing.png
new file mode 100644
index 0000000000..101bae308a
Binary files /dev/null and b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05fiberprocessing.png differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05tbss.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05tbss.png
deleted file mode 100644
index aeb61c6ab8..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05tbss.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css
index edc5605bb4..0daa5f9165 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css
@@ -1,174 +1,193 @@
 @charset "utf-8";
 
 body{
-	margin:0px 0px;
-	padding: 0px 0px;
+  margin:0px 0px;
+  padding: 0px 0px;
 }
 
 h1{
-	margin:0px 0px;
-	padding: 0px 0px;
-	font-family:"Times New Roman", Times, serif;	
-	color:#333;
+  margin:0px 0px;
+  padding: 0px 0px;
+  font-family:"Fira Sans", sans-serif;
+  color:#adb1b6;
 }
 
 img{border:none;}
 
+/* unvisited link */
+a:link {
+   color: #adb1b6;
+}
+
+/* visited link */
+a:visited {
+   color: #adb1b6;
+}
+
+/* mouse over link */
+a:hover {
+   color: #adb1b6;
+}
+
+/* selected link */
+a:active {
+   color: #adb1b6;
+}
+
 #screen{
-	width:100%;
-	min-height:1060px;
-	height:100%;
-	padding-top:15px;
-	background-color:#888888;
-	background-image:url(pics/background.jpg);
-	background-repeat:repeat-x;
+  width:100%;
+  min-height:1060px;
+  height:100%;
+  padding-top:15px;
+  background-color:#1F1F1F;
+  background-repeat:repeat-x;
 }
 
 #welcome{
-	min-width:150px;
-	max-width:690px;
-	margin: 0 auto;
-	padding-left:5px;
-	font-family:"Times New Roman", Times, serif;
-	color:#333;
+  min-width:150px;
+  max-width:690px;
+  margin: 0 auto;
+  padding-left:5px;
+  font-family:"Fira Sans", sans-serif;
+  color:#adb1b6;
 }
 
 #welcomeText{
-	margin-top:15px;
-	margin-bottom:15px;
-	z-index:1;
+  margin-top:15px;
+  margin-bottom:15px;
+  z-index:1;
 }
 
 #bttnField{
-	min-width:150px;
-	max-width:690px;
-	margin: 0 auto;
-	padding-left:5px;
+  min-width:150px;
+  max-width:690px;
+  margin: 0 auto;
+  padding-left:5px;
 }
 
 .bttnWrap{
-	position:relative;
-	float:left;
-	width:140px;
-	height:190px;
-	margin-right:32px;
-	margin-top:5px;
-	z-index:2;
+  position:relative;
+  float:left;
+  width:140px;
+  height:190px;
+  margin-right:32px;
+  margin-top:5px;
+  z-index:2;
 }
 
 .modBttn{
-	margin-bottom:8px;
-	border: solid 2px #000;
+  margin-bottom:8px;
+  border: solid 2px #000;
  -webkit-box-shadow: 5px 5px 6px rgba(0,0,0,0.6);
 }
 
 .modBttn:hover{
-	border: solid 2px #FFF;
-	cursor:pointer;
+  border: solid 2px #FFF;
+  cursor:pointer;
  -webkit-box-shadow: none;
 }
 
 .modBttnHover{
-	margin-bottom:8px;
-	border: solid 2px #FFF;
-	cursor:pointer;
+  margin-bottom:8px;
+  border: solid 2px #FFF;
+  cursor:pointer;
  -webkit-box-shadow: none;
 }
 
 .txtLink{
-	font-family:"Times New Roman", Times, serif;
-	font-size:16px;
-	font-weight:bold;
-	text-decoration:none;
-	cursor:pointer;
-	color:#333;
+  font-family:"Fira Sans", sans-serif;
+  font-size:16px;
+  font-weight:bold;
+  text-decoration:none;
+  cursor:pointer;
+  color:#adb1b6;
 }
 
 .txtLink:hover{
-	text-decoration:underline;
+  text-decoration:underline;
 }
 
 .popUpLink{
-	font-family:"Times New Roman", Times, serif;
-	font-size:14px;
-	font-weight:normal;
-	line-height:16px;
-	color:#333;
+  font-family:"Fira Sans", sans-serif;
+  font-size:14px;
+  font-weight:normal;
+  line-height:16px;
+  color:#adb1b6;
 }
 
 .popUpLink:hover{
-	text-decoration:underline;
-	cursor:pointer;
+  text-decoration:underline;
+  cursor:pointer;
 }
 
 #popup{
-	position:fixed;
-	max-width:690px;
-	min-width:150px;
-	background-color:#000000;
-	opacity: 0.8;
-	-webkit-border-radius: 1em;
-	z-index:3;
-	font-family:Arial, Helvetica, sans-serif;	
-	color:#FFF;
+  position:fixed;
+  max-width:690px;
+  min-width:150px;
+  background-color:#000000;
+  opacity: 0.8;
+  -webkit-border-radius: 1em;
+  z-index:3;
+  font-family:Arial, Helvetica, sans-serif;
+  color:#FFF;
 }
 
 #bttnClose{
-	position:relative;
-	right:10px;
-	top:10px;
-	cursor:pointer;
+  position:relative;
+  right:10px;
+  top:10px;
+  cursor:pointer;
 }
 
 #contHeadline{
-	max-width:690px;
-	min-width:150px;
-	margin-left:10px;
-	margin-right:10px;
-	font-weight:bold;
-	font-size:14px;
-	text-align:left;
+  max-width:690px;
+  min-width:150px;
+  margin-left:10px;
+  margin-right:10px;
+  font-weight:bold;
+  font-size:14px;
+  text-align:left;
 }
 
 #contDescription{
-	max-width:690px;
-	min-width:150px;
-	margin-top:15px;
-	margin-bottom:15px;
-	margin-left:10px;
-	margin-right:10px;
-	line-height:21px;
-	font-family:Arial, Helvetica, sans-serif;	
-	font-weight:normal;
-	font-size:14px;
-	text-align:left;
+  max-width:690px;
+  min-width:150px;
+  margin-top:15px;
+  margin-bottom:15px;
+  margin-left:10px;
+  margin-right:10px;
+  line-height:21px;
+  font-family:Arial, Helvetica, sans-serif;
+  font-weight:normal;
+  font-size:14px;
+  text-align:left;
 }
 
 #contModLink{
-	max-width:690px;
-	min-width:150px;
-	height:50px;
-	margin-left:10px;
-	margin-right:10px;
-	text-align:left;
+  max-width:690px;
+  min-width:150px;
+  height:50px;
+  margin-left:10px;
+  margin-right:10px;
+  text-align:left;
 }
 
 .moduleLink{
-	font-family:Arial, Helvetica, sans-serif;	
-	color:#FFF;
+  font-family:Arial, Helvetica, sans-serif;
+  color:#FFF;
 }
 
 .expPic{
-	margin-top:-126px;	
+  margin-top:-126px;
 }
 
 .clearfloat{clear:both;}