diff --git a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
index 837267c939..69614860c2 100644
--- a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
+++ b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
@@ -1,308 +1,337 @@
 /*===================================================================
 
 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 "QmitkNavigationToolCreationWidget.h"
 
 //mitk headers
 #include "mitkTrackingTypes.h"
 #include <mitkSTLFileReader.h>
 #include <mitkSurface.h>
 #include "mitkNavigationData.h"
 #include "mitkRenderingManager.h"
 
 //qt headers
 #include <qfiledialog.h>
 #include <qmessagebox.h>
 #include <QDialog>
 
 //poco headers
 #include <Poco/Path.h>
 
 // vtk
 #include <vtkSphereSource.h>
 #include "vtkConeSource.h"
 
 const std::string QmitkNavigationToolCreationWidget::VIEW_ID = "org.mitk.views.navigationtoolcreationwizardwidget";
 
 QmitkNavigationToolCreationWidget::QmitkNavigationToolCreationWidget(QWidget* parent, Qt::WindowFlags f)
 : QWidget(parent, f)
 {
-  m_Controls = NULL;
-  m_AdvancedWidget = new QmitkNavigationToolCreationAdvancedWidget(this);
-  m_AdvancedWidget->setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
-  m_AdvancedWidget->setWindowTitle("Tool Creation Advanced Options");
-  m_AdvancedWidget->setModal(false);
-  CreateQtPartControl(this);
-  CreateConnections();
+m_Controls = NULL;
+m_AdvancedWidget = new QmitkNavigationToolCreationAdvancedWidget(this);
+m_AdvancedWidget->setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
+m_AdvancedWidget->setWindowTitle("Tool Creation Advanced Options");
+m_AdvancedWidget->setModal(false);
+CreateQtPartControl(this);
+CreateConnections();
 }
 
 QmitkNavigationToolCreationWidget::~QmitkNavigationToolCreationWidget()
 {
-  delete m_AdvancedWidget;
+delete m_AdvancedWidget;
 }
 
 void QmitkNavigationToolCreationWidget::CreateQtPartControl(QWidget *parent)
 {
-  if (!m_Controls)
-  {
-    // create GUI widgets
-    m_Controls = new Ui::QmitkNavigationToolCreationWidgetControls;
-    m_Controls->setupUi(parent);
-  }
+if (!m_Controls)
+{
+// create GUI widgets
+m_Controls = new Ui::QmitkNavigationToolCreationWidgetControls;
+m_Controls->setupUi(parent);
+}
 }
 
 void QmitkNavigationToolCreationWidget::CreateConnections()
 {
-  if ( m_Controls )
-  {
-    connect( (QObject*)(m_Controls->m_cancel), SIGNAL(clicked()), this, SLOT(OnCancel()) );
-    connect( (QObject*)(m_Controls->m_finished), SIGNAL(clicked()), this, SLOT(OnFinished()) );
-    connect( (QObject*)(m_Controls->m_LoadSurface), SIGNAL(clicked()), this, SLOT(OnLoadSurface()) );
-    connect( (QObject*)(m_Controls->m_LoadCalibrationFile), SIGNAL(clicked()), this, SLOT(OnLoadCalibrationFile()) );
-    connect( (QObject*)(m_Controls->m_ShowAdvancedOptionsPB), SIGNAL(toggled(bool)), this, SLOT(OnShowAdvancedOptions(bool)) );
-    connect( (QObject*)(m_AdvancedWidget), SIGNAL(DialogCloseRequested()), this, SLOT(OnProcessDialogCloseRequest()) );
-    connect( (QObject*)(m_AdvancedWidget), SIGNAL(RetrieveDataForManualToolTipManipulation()), this, SLOT(OnRetrieveDataForManualTooltipManipulation()) );
-
-    connect( m_Controls->m_Surface_Use_Other, SIGNAL(toggled(bool)), this, SLOT(OnSurfaceUseOtherToggled(bool)));
-  }
+if ( m_Controls )
+{
+connect( (QObject*)(m_Controls->m_cancel), SIGNAL(clicked()), this, SLOT(OnCancel()) );
+connect( (QObject*)(m_Controls->m_finished), SIGNAL(clicked()), this, SLOT(OnFinished()) );
+connect( (QObject*)(m_Controls->m_LoadSurface), SIGNAL(clicked()), this, SLOT(OnLoadSurface()) );
+connect( (QObject*)(m_Controls->m_LoadCalibrationFile), SIGNAL(clicked()), this, SLOT(OnLoadCalibrationFile()) );
+connect( (QObject*)(m_Controls->m_ShowAdvancedOptionsPB), SIGNAL(toggled(bool)), this, SLOT(OnShowAdvancedOptions(bool)) );
+connect( (QObject*)(m_AdvancedWidget), SIGNAL(DialogCloseRequested()), this, SLOT(OnProcessDialogCloseRequest()) );
+connect( (QObject*)(m_AdvancedWidget), SIGNAL(RetrieveDataForManualToolTipManipulation()), this, SLOT(OnRetrieveDataForManualTooltipManipulation()) );
+
+connect( m_Controls->m_Surface_Use_Other, SIGNAL(toggled(bool)), this, SLOT(OnSurfaceUseOtherToggled(bool)));
+}
 }
 
 void QmitkNavigationToolCreationWidget::Initialize(mitk::DataStorage* dataStorage, std::string supposedIdentifier, std::string supposedName)
 {
-  m_DataStorage = dataStorage;
-
-  //initialize UI components
-  m_Controls->m_SurfaceChooser->SetDataStorage(m_DataStorage);
-  m_Controls->m_SurfaceChooser->SetAutoSelectNewItems(true);
-  m_Controls->m_SurfaceChooser->SetPredicate(mitk::NodePredicateDataType::New("Surface"));
-
-  //set default data
-  m_Controls->m_ToolNameEdit->setText(supposedName.c_str());
-  m_Controls->m_CalibrationFileName->setText("none");
-  m_Controls->m_Surface_Use_Sphere->setChecked(true);
-  m_AdvancedWidget->SetDataStorage(m_DataStorage);
-  m_Controls->m_IdentifierEdit->setText(supposedIdentifier.c_str());
-
+m_DataStorage = dataStorage;
+
+//initialize UI components
+m_Controls->m_SurfaceChooser->SetDataStorage(m_DataStorage);
+m_Controls->m_SurfaceChooser->SetAutoSelectNewItems(true);
+m_Controls->m_SurfaceChooser->SetPredicate(mitk::NodePredicateDataType::New("Surface"));
+
+//set default data
+m_Controls->m_ToolNameEdit->setText(supposedName.c_str());
+m_Controls->m_CalibrationFileName->setText("none");
+m_Controls->m_Surface_Use_Sphere->setChecked(true);
+m_AdvancedWidget->SetDataStorage(m_DataStorage);
+m_Controls->m_IdentifierEdit->setText(supposedIdentifier.c_str());
+this->InitializeUIToolLandmarkLists();
 }
 
 void QmitkNavigationToolCreationWidget::SetTrackingDeviceType(mitk::TrackingDeviceType type, bool changeable)
 {
-  switch(type)
-  {
-  case mitk::NDIAurora:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);break;
-  case mitk::NDIPolaris:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(1);break;
-  case mitk::ClaronMicron:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(2);break;
-    case mitk::NPOptitrack:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(3);break;
-  default:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);
-  }
-  m_Controls->m_TrackingDeviceTypeChooser->setEnabled(changeable);
+switch(type)
+{
+case mitk::NDIAurora:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);break;
+case mitk::NDIPolaris:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(1);break;
+case mitk::ClaronMicron:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(2);break;
+case mitk::NPOptitrack:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(3);break;
+default:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);
+}
+m_Controls->m_TrackingDeviceTypeChooser->setEnabled(changeable);
 }
 
 mitk::NavigationTool::Pointer QmitkNavigationToolCreationWidget::GetCreatedTool()
 {
-  return m_CreatedTool;
+return m_CreatedTool;
 }
 
 //##################################################################################
 //############################## slots                  ############################
 //##################################################################################
 
 void QmitkNavigationToolCreationWidget::OnFinished()
 {
-  //here we create a new tool
-  m_CreatedTool = mitk::NavigationTool::New();
-
-  //create DataNode...
-  mitk::DataNode::Pointer newNode = mitk::DataNode::New();
-  if(m_Controls->m_Surface_Use_Sphere->isChecked())
-  {
-    //create small sphere and use it as surface
-    mitk::Surface::Pointer mySphere = mitk::Surface::New();
-    vtkConeSource *vtkData = vtkConeSource::New();
-    vtkData->SetAngle(5.0);
-    vtkData->SetResolution(50);
-    vtkData->SetHeight(6.0f);
-    vtkData->SetRadius(2.0f);
-    vtkData->SetCenter(0.0, 0.0, 0.0);
-    vtkData->Update();
-    mySphere->SetVtkPolyData(vtkData->GetOutput());
-    vtkData->Delete();
-    newNode->SetData(mySphere);
-  }
-  else
-  {
-    newNode->SetData(m_Controls->m_SurfaceChooser->GetSelectedNode()->GetData());
-  }
-  newNode->SetName(m_Controls->m_ToolNameEdit->text().toLatin1());
-
-  m_CreatedTool->SetDataNode(newNode);
-
-  //fill NavigationTool object
-  m_CreatedTool->SetCalibrationFile(m_Controls->m_CalibrationFileName->text().toAscii().data());
-  m_CreatedTool->SetIdentifier(m_Controls->m_IdentifierEdit->text().toAscii().data());
-  m_CreatedTool->SetSerialNumber(m_Controls->m_SerialNumberEdit->text().toAscii().data());
-
-  //Tracking Device
-  if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="NDI Aurora") m_CreatedTool->SetTrackingDeviceType(mitk::NDIAurora);
-  else if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="NDI Polaris") m_CreatedTool->SetTrackingDeviceType(mitk::NDIPolaris);
-  else if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="Claron Technology Micron Tracker") m_CreatedTool->SetTrackingDeviceType(mitk::ClaronMicron);
-  else if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="NP Optitrack") m_CreatedTool->SetTrackingDeviceType(mitk::NPOptitrack);
-  else m_CreatedTool->SetTrackingDeviceType(mitk::TrackingSystemNotSpecified);
-
-  //ToolType
-  if (m_Controls->m_ToolTypeChooser->currentText()=="Instrument") m_CreatedTool->SetType(mitk::NavigationTool::Instrument);
-  else if (m_Controls->m_ToolTypeChooser->currentText()=="Fiducial") m_CreatedTool->SetType(mitk::NavigationTool::Fiducial);
-  else if (m_Controls->m_ToolTypeChooser->currentText()=="Skinmarker") m_CreatedTool->SetType(mitk::NavigationTool::Skinmarker);
-  else m_CreatedTool->SetType(mitk::NavigationTool::Unknown);
-
-  mitk::NavigationData::Pointer tempND = mitk::NavigationData::New(m_AdvancedWidget->GetManipulatedToolTip());
-  m_CreatedTool->SetToolTipOrientation(tempND->GetOrientation());
-  m_CreatedTool->SetToolTipPosition(tempND->GetPosition());
-
-  emit NavigationToolFinished();
+//here we create a new tool
+m_CreatedTool = mitk::NavigationTool::New();
+
+//create DataNode...
+mitk::DataNode::Pointer newNode = mitk::DataNode::New();
+if(m_Controls->m_Surface_Use_Sphere->isChecked())
+{
+//create small sphere and use it as surface
+mitk::Surface::Pointer mySphere = mitk::Surface::New();
+vtkConeSource *vtkData = vtkConeSource::New();
+vtkData->SetAngle(5.0);
+vtkData->SetResolution(50);
+vtkData->SetHeight(6.0f);
+vtkData->SetRadius(2.0f);
+vtkData->SetCenter(0.0, 0.0, 0.0);
+vtkData->Update();
+mySphere->SetVtkPolyData(vtkData->GetOutput());
+vtkData->Delete();
+newNode->SetData(mySphere);
+}
+else
+{
+newNode->SetData(m_Controls->m_SurfaceChooser->GetSelectedNode()->GetData());
+}
+newNode->SetName(m_Controls->m_ToolNameEdit->text().toLatin1());
+
+m_CreatedTool->SetDataNode(newNode);
+
+//fill NavigationTool object
+m_CreatedTool->SetCalibrationFile(m_Controls->m_CalibrationFileName->text().toAscii().data());
+m_CreatedTool->SetIdentifier(m_Controls->m_IdentifierEdit->text().toAscii().data());
+m_CreatedTool->SetSerialNumber(m_Controls->m_SerialNumberEdit->text().toAscii().data());
+
+//Tracking Device
+if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="NDI Aurora") m_CreatedTool->SetTrackingDeviceType(mitk::NDIAurora);
+else if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="NDI Polaris") m_CreatedTool->SetTrackingDeviceType(mitk::NDIPolaris);
+else if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="Claron Technology Micron Tracker") m_CreatedTool->SetTrackingDeviceType(mitk::ClaronMicron);
+else if (m_Controls->m_TrackingDeviceTypeChooser->currentText()=="NP Optitrack") m_CreatedTool->SetTrackingDeviceType(mitk::NPOptitrack);
+else m_CreatedTool->SetTrackingDeviceType(mitk::TrackingSystemNotSpecified);
+
+//ToolType
+if (m_Controls->m_ToolTypeChooser->currentText()=="Instrument") m_CreatedTool->SetType(mitk::NavigationTool::Instrument);
+else if (m_Controls->m_ToolTypeChooser->currentText()=="Fiducial") m_CreatedTool->SetType(mitk::NavigationTool::Fiducial);
+else if (m_Controls->m_ToolTypeChooser->currentText()=="Skinmarker") m_CreatedTool->SetType(mitk::NavigationTool::Skinmarker);
+else m_CreatedTool->SetType(mitk::NavigationTool::Unknown);
+
+//Tool Tip
+mitk::NavigationData::Pointer tempND = mitk::NavigationData::New(m_AdvancedWidget->GetManipulatedToolTip());
+m_CreatedTool->SetToolTipOrientation(tempND->GetOrientation());
+m_CreatedTool->SetToolTipPosition(tempND->GetPosition());
+
+//Tool Landmarks
+mitk::PointSet::Pointer toolCalLandmarks, toolRegLandmarks;
+GetUIToolLandmarksLists(toolCalLandmarks,toolRegLandmarks);
+m_CreatedTool->SetToolCalibrationLandmarks(toolCalLandmarks);
+m_CreatedTool->SetToolRegistrationLandmarks(toolRegLandmarks);
+
+emit NavigationToolFinished();
 }
 
 void QmitkNavigationToolCreationWidget::OnCancel()
 {
-  m_CreatedTool = NULL;
+m_CreatedTool = NULL;
 
-  emit Canceled();
+emit Canceled();
 }
 
 void QmitkNavigationToolCreationWidget::OnLoadSurface()
 {
-  std::string filename = QFileDialog::getOpenFileName(NULL,tr("Open Surface"), "/", tr("STL (*.stl)")).toLatin1().data();
-  mitk::STLFileReader::Pointer stlReader = mitk::STLFileReader::New();
-  try
-  {
-    stlReader->SetFileName( filename.c_str() );
-    stlReader->Update();
-  }
-  catch (...)
-  {
-  }
-
-  if ( stlReader->GetOutput() == NULL );
-  else
-  {
-    mitk::DataNode::Pointer newNode = mitk::DataNode::New();
-    newNode->SetName(filename);
-    newNode->SetData(stlReader->GetOutput());
-    m_DataStorage->Add(newNode);
-  }
+std::string filename = QFileDialog::getOpenFileName(NULL,tr("Open Surface"), "/", tr("STL (*.stl)")).toLatin1().data();
+mitk::STLFileReader::Pointer stlReader = mitk::STLFileReader::New();
+try
+{
+stlReader->SetFileName( filename.c_str() );
+stlReader->Update();
+}
+catch (...)
+{
+}
+
+if ( stlReader->GetOutput() == NULL );
+else
+{
+mitk::DataNode::Pointer newNode = mitk::DataNode::New();
+newNode->SetName(filename);
+newNode->SetData(stlReader->GetOutput());
+m_DataStorage->Add(newNode);
+}
 }
 
 void QmitkNavigationToolCreationWidget::OnLoadCalibrationFile()
 {
-  m_Controls->m_CalibrationFileName->setText(QFileDialog::getOpenFileName(NULL,tr("Open Calibration File"), "/", "*.*"));
+m_Controls->m_CalibrationFileName->setText(QFileDialog::getOpenFileName(NULL,tr("Open Calibration File"), "/", "*.*"));
 }
 
 void QmitkNavigationToolCreationWidget::SetDefaultData(mitk::NavigationTool::Pointer DefaultTool)
 {
-  m_Controls->m_ToolNameEdit->setText(QString(DefaultTool->GetDataNode()->GetName().c_str()));
-  m_Controls->m_IdentifierEdit->setText(QString(DefaultTool->GetIdentifier().c_str()));
-  m_Controls->m_SerialNumberEdit->setText(QString(DefaultTool->GetSerialNumber().c_str()));
-  m_AdvancedWidget->SetDefaultTooltip( DefaultTool->GetToolTipTransform() );
-  switch(DefaultTool->GetTrackingDeviceType())
-  {
-  case mitk::NDIAurora:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);break;
-  case mitk::NDIPolaris:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(1);break;
-  case mitk::ClaronMicron:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(2);break;
-  case mitk::NPOptitrack:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(3);break;
-  default:
-    m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);
-  }
-  m_Controls->m_CalibrationFileName->setText(QString(DefaultTool->GetCalibrationFile().c_str()));
-  m_Controls->m_Surface_Use_Other->setChecked(true);
-  switch(DefaultTool->GetType())
-      {
-      case mitk::NavigationTool::Instrument:
-        m_Controls->m_ToolTypeChooser->setCurrentIndex(0); break;
-      case mitk::NavigationTool::Fiducial:
-        m_Controls->m_ToolTypeChooser->setCurrentIndex(1); break;
-      case mitk::NavigationTool::Skinmarker:
-        m_Controls->m_ToolTypeChooser->setCurrentIndex(2); break;
-      case mitk::NavigationTool::Unknown:
-        m_Controls->m_ToolTypeChooser->setCurrentIndex(3); break;
-      }
-
-  m_Controls->m_SurfaceChooser->SetSelectedNode(DefaultTool->GetDataNode());
+m_Controls->m_ToolNameEdit->setText(QString(DefaultTool->GetDataNode()->GetName().c_str()));
+m_Controls->m_IdentifierEdit->setText(QString(DefaultTool->GetIdentifier().c_str()));
+m_Controls->m_SerialNumberEdit->setText(QString(DefaultTool->GetSerialNumber().c_str()));
+m_AdvancedWidget->SetDefaultTooltip( DefaultTool->GetToolTipTransform() );
+switch(DefaultTool->GetTrackingDeviceType())
+{
+case mitk::NDIAurora:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);break;
+case mitk::NDIPolaris:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(1);break;
+case mitk::ClaronMicron:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(2);break;
+case mitk::NPOptitrack:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(3);break;
+default:
+m_Controls->m_TrackingDeviceTypeChooser->setCurrentIndex(0);
+}
+m_Controls->m_CalibrationFileName->setText(QString(DefaultTool->GetCalibrationFile().c_str()));
+m_Controls->m_Surface_Use_Other->setChecked(true);
+switch(DefaultTool->GetType())
+{
+case mitk::NavigationTool::Instrument:
+m_Controls->m_ToolTypeChooser->setCurrentIndex(0); break;
+case mitk::NavigationTool::Fiducial:
+m_Controls->m_ToolTypeChooser->setCurrentIndex(1); break;
+case mitk::NavigationTool::Skinmarker:
+m_Controls->m_ToolTypeChooser->setCurrentIndex(2); break;
+case mitk::NavigationTool::Unknown:
+m_Controls->m_ToolTypeChooser->setCurrentIndex(3); break;
+}
 
+m_Controls->m_SurfaceChooser->SetSelectedNode(DefaultTool->GetDataNode());
+FillUIToolLandmarkLists(DefaultTool->GetToolCalibrationLandmarks(),DefaultTool->GetToolRegistrationLandmarks());
 }
 
 
 
 //##################################################################################
 //############################## internal help methods #############################
 //##################################################################################
 void QmitkNavigationToolCreationWidget::MessageBox(std::string s)
 {
-  QMessageBox msgBox;
-  msgBox.setText(s.c_str());
-  msgBox.exec();
+QMessageBox msgBox;
+msgBox.setText(s.c_str());
+msgBox.exec();
 }
 
 void QmitkNavigationToolCreationWidget::OnShowAdvancedOptions(bool state)
 {
-  if(state)
-  {
-    m_AdvancedWidget->show();
-    m_AdvancedWidget->SetDefaultTooltip(m_AdvancedWidget->GetManipulatedToolTip()); //use the last one, if there is one
-    m_AdvancedWidget->ReInitialize();
-
-    // reinit the views with the new nodes
-    mitk::DataStorage::SetOfObjects::ConstPointer rs = m_DataStorage->GetAll();
-    mitk::TimeGeometry::Pointer bounds = m_DataStorage->ComputeBoundingGeometry3D(rs, "visible");    // initialize the views to the bounding geometry
-    mitk::RenderingManager::GetInstance()->InitializeViews(bounds);
-  }
-  else
-  {
-    m_AdvancedWidget->hide();
-  }
+if(state)
+{
+m_AdvancedWidget->show();
+m_AdvancedWidget->SetDefaultTooltip(m_AdvancedWidget->GetManipulatedToolTip()); //use the last one, if there is one
+m_AdvancedWidget->ReInitialize();
+
+// reinit the views with the new nodes
+mitk::DataStorage::SetOfObjects::ConstPointer rs = m_DataStorage->GetAll();
+mitk::TimeGeometry::Pointer bounds = m_DataStorage->ComputeBoundingGeometry3D(rs, "visible");    // initialize the views to the bounding geometry
+mitk::RenderingManager::GetInstance()->InitializeViews(bounds);
+}
+else
+{
+m_AdvancedWidget->hide();
+}
 }
 
 void QmitkNavigationToolCreationWidget::OnProcessDialogCloseRequest()
 {
-  m_AdvancedWidget->hide();
-  m_Controls->m_ShowAdvancedOptionsPB->setChecked(false);
+m_AdvancedWidget->hide();
+m_Controls->m_ShowAdvancedOptionsPB->setChecked(false);
 }
 
 void QmitkNavigationToolCreationWidget::OnRetrieveDataForManualTooltipManipulation()
 {
-  if(m_Controls->m_Surface_Use_Sphere->isChecked())
-  {
-    m_AdvancedWidget->SetToolTipSurface(true);
-  }
-  else
-  {
-    m_AdvancedWidget->SetToolTipSurface(false,
-      dynamic_cast<mitk::DataNode*>(m_Controls->m_SurfaceChooser->GetSelectedNode().GetPointer()));
-  }
+if(m_Controls->m_Surface_Use_Sphere->isChecked())
+{
+m_AdvancedWidget->SetToolTipSurface(true);
+}
+else
+{
+m_AdvancedWidget->SetToolTipSurface(false,
+dynamic_cast<mitk::DataNode*>(m_Controls->m_SurfaceChooser->GetSelectedNode().GetPointer()));
+}
 }
 
 void QmitkNavigationToolCreationWidget::OnSurfaceUseOtherToggled(bool checked)
 {
-  m_Controls->m_LoadSurface->setEnabled(checked);
+m_Controls->m_LoadSurface->setEnabled(checked);
+}
+
+void QmitkNavigationToolCreationWidget::FillUIToolLandmarkLists(mitk::PointSet::Pointer calLandmarks, mitk::PointSet::Pointer regLandmarks)
+{
+m_calLandmarkNode->SetData(calLandmarks);
+m_regLandmarkNode->SetData(regLandmarks);
+m_Controls->m_CalibrationLandmarksList->SetPointSetNode(m_calLandmarkNode);
+m_Controls->m_RegistrationLandmarksList->SetPointSetNode(m_regLandmarkNode);
+
+}
+
+void QmitkNavigationToolCreationWidget::GetUIToolLandmarksLists(mitk::PointSet::Pointer& calLandmarks, mitk::PointSet::Pointer& regLandmarks)
+{
+calLandmarks = dynamic_cast<mitk::PointSet*>(m_calLandmarkNode->GetData());
+regLandmarks = dynamic_cast<mitk::PointSet*>(m_regLandmarkNode->GetData());
+}
+
+void QmitkNavigationToolCreationWidget::InitializeUIToolLandmarkLists()
+{
+m_calLandmarkNode = mitk::DataNode::New();
+m_regLandmarkNode = mitk::DataNode::New();
+FillUIToolLandmarkLists(mitk::PointSet::New(),mitk::PointSet::New());
 }
diff --git a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h
index 4aad403635..042b27cd15 100644
--- a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h
+++ b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h
@@ -1,109 +1,125 @@
 /*===================================================================
 
 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 QmitkNavigationToolCreationWidget_H
 #define QmitkNavigationToolCreationWidget_H
 
 //QT headers
 #include <QWidget>
 
 //mitk headers
 #include "MitkIGTUIExports.h"
 #include <mitkNavigationTool.h>
 #include <mitkNavigationToolStorage.h>
 #include <mitkNodePredicateDataType.h>
 
 // Qmitk headers
 #include "QmitkNavigationToolCreationAdvancedWidget.h"
 
 //ui header
 #include "ui_QmitkNavigationToolCreationWidget.h"
 
  /** Documentation:
   *   \brief An object of this class offers an UI to create or modify NavigationTools.
   *
   *          Be sure to call the initialize method before you start the widget
   *          otherwise some errors might occure.
   *
   *   \ingroup IGTUI
   */
 class MitkIGTUI_EXPORT QmitkNavigationToolCreationWidget : public QWidget
 {
   Q_OBJECT
 
   public:
     static const std::string VIEW_ID;
 
     /** @brief Initializes the widget.
       * @param dataStorage  The data storage is needed to offer the possibility to choose surfaces from the data storage for tool visualization.
       * @param supposedIdentifier This Identifier is supposed for the user. It is needed because every identifier in a navigation tool storage must be unique and we don't know the others.
       */
     void Initialize(mitk::DataStorage* dataStorage, std::string supposedIdentifier, std::string supposedName = "NewTool");
 
     /** @brief Sets the default tracking device type. You may also define if it is changeable or not.*/
     void SetTrackingDeviceType(mitk::TrackingDeviceType type, bool changeable = true);
 
     /** @brief Sets the default data of all input fields. The default data is used from the default tool which is given as parameter. */
     void SetDefaultData(mitk::NavigationTool::Pointer DefaultTool);
 
     QmitkNavigationToolCreationWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
     ~QmitkNavigationToolCreationWidget();
 
     /** @return Returns the created tool. Returns NULL if no tool was created yet. */
     mitk::NavigationTool::Pointer GetCreatedTool();
 
 
   signals:
 
     /** @brief This signal is emitted if the user finished the creation of the tool. */
     void NavigationToolFinished();
 
     /** @brief This signal is emitted if the user canceled the creation of the tool. */
     void Canceled();
 
   protected slots:
 
     void OnCancel();
     void OnFinished();
     void OnLoadSurface();
     void OnLoadCalibrationFile();
     void OnShowAdvancedOptions(bool state);
     void OnProcessDialogCloseRequest();
     void OnRetrieveDataForManualTooltipManipulation();
     void OnSurfaceUseOtherToggled(bool checked);
 
   protected:
 
     /// \brief Creation of the connections
     virtual void CreateConnections();
 
     virtual void CreateQtPartControl(QWidget *parent);
 
     Ui::QmitkNavigationToolCreationWidgetControls* m_Controls;
 
     QmitkNavigationToolCreationAdvancedWidget* m_AdvancedWidget;
 
     /** @brief holds the DataStorage */
     mitk::DataStorage* m_DataStorage;
 
     /** @brief this pointer holds the tool which is created */
     mitk::NavigationTool::Pointer m_CreatedTool;
 
     //############## private help methods #######################
+    /** Shows a message box with the given message s. */
     void MessageBox(std::string s);
 
+    /** Hold the data nodes which are needed for the landmark widgets. */
+    mitk::DataNode::Pointer m_calLandmarkNode, m_regLandmarkNode;
+
+    /** Set the tool landmark lists in the UI.*/
+    void FillUIToolLandmarkLists(mitk::PointSet::Pointer calLandmarks, mitk::PointSet::Pointer regLandmarks);
+
+    /** Returns the tool landmark lists from the UI.
+      * @param[out] calLandmarks Returns a pointer to the calibration landmarks point set.
+      * @param[out] regLandmarks Returns a pointer to the registration landmarks point set.
+      */
+    void GetUIToolLandmarksLists(mitk::PointSet::Pointer& calLandmarks, mitk::PointSet::Pointer& regLandmarks);
+
+    /** Initializes the tool landmark lists in the UI. */
+    void InitializeUIToolLandmarkLists();
+
 };
 #endif
diff --git a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui
index 0572c457bd..28beb9ffb6 100644
--- a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui
+++ b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui
@@ -1,483 +1,531 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkNavigationToolCreationWidgetControls</class>
  <widget class="QWidget" name="QmitkNavigationToolCreationWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>358</width>
-    <height>371</height>
+    <width>254</width>
+    <height>309</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Device Type:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="m_TrackingDeviceTypeChooser">
        <property name="minimumSize">
         <size>
          <width>150</width>
          <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>150</width>
          <height>16777215</height>
         </size>
        </property>
        <item>
         <property name="text">
          <string>NDI Aurora</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>NDI Polaris</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Claron Technology Micron Tracker</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>NP Optitrack</string>
         </property>
        </item>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="page">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>340</width>
-        <height>205</height>
+        <width>236</width>
+        <height>90</height>
        </rect>
       </property>
       <attribute name="label">
        <string>Basic Information</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_11">
          <item>
           <widget class="QLabel" name="label_3">
            <property name="minimumSize">
             <size>
              <width>100</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>Name:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="m_ToolNameEdit">
            <property name="text">
             <string>NewTool</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_6">
          <item>
           <widget class="QLabel" name="label_8">
            <property name="minimumSize">
             <size>
              <width>100</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>Calibration File:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="m_CalibrationFileName">
            <property name="text">
             <string>none</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="m_LoadCalibrationFile">
            <property name="maximumSize">
             <size>
              <width>40</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="text">
             <string>Load</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <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_2">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>340</width>
-        <height>205</height>
+        <width>310</width>
+        <height>113</height>
        </rect>
       </property>
       <attribute name="label">
        <string>Tool Visualization</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QRadioButton" name="m_Surface_Use_Sphere">
          <property name="text">
           <string>Use Simple Cone</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="m_Surface_Use_Other">
          <property name="text">
           <string>Use Surface:</string>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Fixed</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>25</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QmitkDataStorageComboBox" name="m_SurfaceChooser">
            <property name="minimumSize">
             <size>
              <width>200</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>150</width>
              <height>16777215</height>
             </size>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="m_LoadSurface">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="maximumSize">
             <size>
              <width>40</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="text">
             <string>Load</string>
            </property>
           </widget>
          </item>
          <item>
           <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>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>8</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="page_4">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>232</width>
+        <height>85</height>
+       </rect>
+      </property>
+      <attribute name="label">
+       <string>Tool Landmarks</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <widget class="QTabWidget" name="m_RegistrationLandmarksTab">
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="tab">
+          <attribute name="title">
+           <string>Calibration Landmarks</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_7">
+           <item>
+            <widget class="QmitkPointListWidget" name="m_CalibrationLandmarksList" native="true"/>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_2">
+          <attribute name="title">
+           <string>Registration Landmarks</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QmitkPointListWidget" name="m_RegistrationLandmarksList" native="true"/>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="page_3">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>340</width>
-        <height>129</height>
+        <width>281</width>
+        <height>152</height>
        </rect>
       </property>
       <attribute name="label">
        <string>Advanced</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QLabel" name="label_7">
            <property name="minimumSize">
             <size>
              <width>100</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>Tool Type:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QComboBox" name="m_ToolTypeChooser">
            <property name="minimumSize">
             <size>
              <width>150</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>150</width>
              <height>16777215</height>
             </size>
            </property>
            <item>
             <property name="text">
              <string>Instrument</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Fiducial</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Skinmarker</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Unkown</string>
             </property>
            </item>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
           <widget class="QLabel" name="label_4">
            <property name="minimumSize">
             <size>
              <width>100</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>Identifier:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="m_IdentifierEdit">
            <property name="text">
             <string>&lt;not given&gt;</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <item>
           <widget class="QLabel" name="label_5">
            <property name="minimumSize">
             <size>
              <width>100</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>Serial Number:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="m_SerialNumberEdit">
            <property name="text">
             <string>&lt;not given&gt;</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>Tooltip:</string>
            </property>
           </widget>
          </item>
          <item>
           <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>
          <item>
           <widget class="QPushButton" name="m_ShowAdvancedOptionsPB">
            <property name="text">
             <string>Edit Tooltip</string>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <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>
    </item>
    <item>
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_7">
      <item>
       <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>
       <widget class="QPushButton" name="m_cancel">
        <property name="text">
         <string>Cancel</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="m_finished">
        <property name="text">
         <string>Finished</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header>QmitkDataStorageComboBox.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QmitkPointListWidget</class>
+   <extends>QWidget</extends>
+   <header>QmitkPointListWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>