diff --git a/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp b/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp
index 7b7d3bc7b2..8c3f2eb636 100644
--- a/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp
+++ b/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp
@@ -1,210 +1,210 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
 // Qmitk
 #include "QmitkDicomExternalDataWidget.h"
 #include <mitkLogMacros.h>
 
 // CTK
 #include <ctkFileDialog.h>
 
 // Qt
 #include <QCheckBox>
 #include <QMessageBox>
 
 const std::string QmitkDicomExternalDataWidget::Widget_ID = "org.mitk.Widgets.QmitkDicomExternalDataWidget";
 
 QmitkDicomExternalDataWidget::QmitkDicomExternalDataWidget(QWidget *parent)
   : QWidget(parent)
   , m_Controls (0)
 {
     Initialize();
     CreateQtPartControl(this);
 }
 
 QmitkDicomExternalDataWidget::~QmitkDicomExternalDataWidget()
 {
 }
 
 
 void QmitkDicomExternalDataWidget::CreateQtPartControl( QWidget *parent )
 {
 
     // build up qt Widget, unless already done
     if ( !m_Controls )
     {
         // create GUI widgets from the Qt Designer's .ui file
         m_Controls = new Ui::QmitkDicomExternalDataWidgetControls;
         m_Controls->setupUi( parent );
         m_Controls->viewExternalDataButton->setVisible(true);
-        m_Controls->ctkDICOMBrowser->setDynamicTableLayout(true);
+        m_Controls->ctkDICOMBrowser->setTableOrientation(Qt::Vertical);
         m_Controls->ctkDICOMBrowser->setDICOMDatabase(m_ExternalDatabase);
 
         this->SetupImportDialog();
         this->SetupProgressDialog(parent);
 
         //connect Buttons
         connect(m_Controls->downloadButton, SIGNAL(clicked()),this,SLOT(OnDownloadButtonClicked()));
         connect(m_Controls->viewExternalDataButton, SIGNAL(clicked()),this,SLOT(OnViewButtonClicked()));
         connect(m_Controls->directoryButton, SIGNAL(clicked()), this, SLOT(OnScanDirectory()));
 
         connect(m_Controls->ctkDICOMBrowser, SIGNAL(seriesSelectionChanged(const QStringList&)),
                 this, SLOT(OnSeriesSelectionChanged(const QStringList&)));
         connect(m_Controls->ctkDICOMBrowser, SIGNAL(seriesDoubleClicked(const QModelIndex&)),
                 this, SLOT(OnViewButtonClicked()));
 
         connect(m_ProgressDialog, SIGNAL(canceled()), m_ExternalIndexer, SLOT(cancel()));
         connect(m_ExternalIndexer, SIGNAL(indexingComplete()),this, SLOT(OnFinishedImport()));
 
         connect(m_ExternalIndexer, SIGNAL(indexingFilePath(const QString&)), m_ProgressDialogLabel, SLOT(setText(const QString&)));
         connect(m_ExternalIndexer, SIGNAL(progress(int)), m_ProgressDialog, SLOT(setValue(int)));
     }
 }
 
 void QmitkDicomExternalDataWidget::Initialize()
 {
     m_ExternalDatabase = new ctkDICOMDatabase(this);
 
     try{
         m_ExternalDatabase->openDatabase(QString(":memory:"),QString( "EXTERNAL-DB"));
     }catch(std::exception e){
         MITK_ERROR <<"Database error: "<< m_ExternalDatabase->lastError().toStdString();
         m_ExternalDatabase->closeDatabase();
         return;
     }
 
     m_ExternalIndexer = new ctkDICOMIndexer(this);
 }
 
 void QmitkDicomExternalDataWidget::OnFinishedImport()
 {
   m_ProgressDialog->setValue(m_ProgressDialog->maximum());
 }
 
 void QmitkDicomExternalDataWidget::OnDownloadButtonClicked()
 {
   QStringList filesToDownload = GetFileNamesFromIndex();
   if (filesToDownload.size() == 0)
   {
     QMessageBox info;
     info.setText("You have to select an entry in the dicom browser for import.");
     info.exec();
     return;
   }
     emit SignalStartDicomImport(GetFileNamesFromIndex());
 }
 
 void QmitkDicomExternalDataWidget::OnViewButtonClicked()
 {
   QStringList uids = m_Controls->ctkDICOMBrowser->currentSeriesSelection();
   QString uid;
   foreach (uid, uids)
   {
     QStringList filesForSeries = m_ExternalDatabase->filesForSeries(uid);
     QHash<QString, QVariant> eventProperty;
     eventProperty.insert("FilesForSeries", filesForSeries);
     emit SignalDicomToDataManager(eventProperty);
   }
 }
 
 QStringList QmitkDicomExternalDataWidget::GetFileNamesFromIndex()
 {
     QStringList filePaths;
 
     QString uid;
     QStringList seriesUIDs = m_Controls->ctkDICOMBrowser->currentSeriesSelection();
     foreach (uid, seriesUIDs)
     {
       filePaths.append(m_ExternalDatabase->filesForSeries(uid));
 
     }
     if (!filePaths.empty())
       return filePaths;
 
     QStringList studyUIDs = m_Controls->ctkDICOMBrowser->currentStudiesSelection();
 
     foreach (uid, studyUIDs)
       {
         seriesUIDs = m_ExternalDatabase->seriesForStudy(uid);
         foreach (uid, seriesUIDs)
           {
             filePaths.append(m_ExternalDatabase->filesForSeries(uid));
           }
       }
     if (!filePaths.empty())
       return filePaths;
 
     QStringList patientsUIDs = m_Controls->ctkDICOMBrowser->currentPatientsSelection();
 
     foreach (uid, patientsUIDs)
       {
         studyUIDs = m_ExternalDatabase->studiesForPatient(uid);
 
         foreach (uid, studyUIDs)
           {
             seriesUIDs = m_ExternalDatabase->seriesForStudy(uid);
             foreach (uid, seriesUIDs)
               {
                 filePaths.append(m_ExternalDatabase->filesForSeries(uid));
               }
           }
       }
     return filePaths;
 }
 
 void QmitkDicomExternalDataWidget::OnStartDicomImport(const QString& directory)
 {
   m_ImportDialog->close();
   m_ProgressDialog->show();
 
     m_LastImportDirectory = directory;
     m_ExternalIndexer->addDirectory(*m_ExternalDatabase,m_LastImportDirectory);
 }
 
 void QmitkDicomExternalDataWidget::OnSeriesSelectionChanged(const QStringList& s)
 {
   m_Controls->viewExternalDataButton->setEnabled( (s.size() != 0) );
 }
 
 void QmitkDicomExternalDataWidget::SetupImportDialog()
 {
         //Initialize import widget
         m_ImportDialog = new ctkFileDialog(this);
         // Since copy on import is not working at the moment
         // this feature is diabled
 //        QCheckBox* importCheckbox = new QCheckBox("Copy on import", m_ImportDialog);
 //        m_ImportDialog->setBottomWidget(importCheckbox);
         m_ImportDialog->setFileMode(QFileDialog::Directory);
         m_ImportDialog->setLabelText(QFileDialog::Accept,"Import");
         m_ImportDialog->setWindowTitle("Import DICOM files from directory ...");
         m_ImportDialog->setWindowModality(Qt::ApplicationModal);
         connect(m_ImportDialog, SIGNAL(fileSelected(QString)),this,SLOT(OnStartDicomImport(QString)));
 }
 
 void QmitkDicomExternalDataWidget::SetupProgressDialog(QWidget* parent)
 {
     m_ProgressDialog = new QProgressDialog("DICOM Import", "Cancel", 0, 100, parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
     m_ProgressDialogLabel = new QLabel("Initialization...", m_ProgressDialog);
     m_ProgressDialog->setLabel(m_ProgressDialogLabel);
     m_ProgressDialog->setWindowModality(Qt::ApplicationModal);
     m_ProgressDialog->setMinimumDuration(0);
 }
 
 void QmitkDicomExternalDataWidget::OnScanDirectory()
 {
   m_ImportDialog->show();
 }
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp b/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
index 0fbf874f85..64d3e3aa4f 100644
--- a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
+++ b/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
@@ -1,157 +1,157 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 // Qmitk
 #include "QmitkDicomLocalStorageWidget.h"
 //#include <mitkLogMacros.h>
 
 // Qt
 #include <QLabel>
 #include <QProgressDialog>
 #include <QVariant>
 
 const std::string QmitkDicomLocalStorageWidget::Widget_ID = "org.mitk.Widgets.QmitkDicomLocalStorageWidget";
 
 QmitkDicomLocalStorageWidget::QmitkDicomLocalStorageWidget(QWidget *parent)
   : QWidget(parent)
   , m_Controls(0)
   , m_LocalIndexer(new ctkDICOMIndexer(parent))
 {
     CreateQtPartControl(this);
 }
 
 QmitkDicomLocalStorageWidget::~QmitkDicomLocalStorageWidget()
 {
     m_LocalDatabase->closeDatabase();
 }
 
 void QmitkDicomLocalStorageWidget::CreateQtPartControl( QWidget *parent )
 {
     if ( !m_Controls )
     {
         m_Controls = new Ui::QmitkDicomLocalStorageWidgetControls;
         m_Controls->setupUi( parent );
 
         this->SetupProgressDialog(this);
 
         connect(m_Controls->deleteButton,SIGNAL(clicked()),this,SLOT(OnDeleteButtonClicked()));
         connect(m_Controls->viewInternalDataButton, SIGNAL(clicked()), this , SLOT(OnViewButtonClicked()));
 
         connect(m_Controls->ctkDicomBrowser, SIGNAL(seriesSelectionChanged(const QStringList&)),
                 this, SLOT(OnSeriesSelectionChanged(const QStringList&)));
         connect(m_Controls->ctkDicomBrowser, SIGNAL(seriesSelectionChanged(const QStringList&)),
                 this, SLOT(OnSeriesSelectionChanged(const QStringList&)));
         connect(m_Controls->ctkDicomBrowser, SIGNAL(seriesDoubleClicked(const QModelIndex&)),
                 this, SLOT(OnViewButtonClicked()));
 
         connect(m_LocalIndexer, SIGNAL(indexingComplete()),this, SLOT(OnFinishedImport()));
         connect(m_LocalIndexer, SIGNAL(indexingComplete()),this, SIGNAL(SignalFinishedImport()));
         connect(m_LocalIndexer, SIGNAL(indexingComplete()),this, SLOT(OnFinishedImport()));
         connect(m_LocalIndexer, SIGNAL(indexingFilePath(const QString&)), m_ProgressDialogLabel, SLOT(setText(const QString&)));
         connect(m_LocalIndexer, SIGNAL(progress(int)), m_ProgressDialog, SLOT(setValue(int)));
         connect(m_ProgressDialog, SIGNAL(canceled()), m_LocalIndexer, SLOT(cancel()));
 
-        m_Controls->ctkDicomBrowser->setDynamicTableLayout(true);
+        m_Controls->ctkDicomBrowser->setTableOrientation(Qt::Vertical);
     }
 }
 
 void QmitkDicomLocalStorageWidget::OnStartDicomImport(const QString& dicomData)
 {
     if(m_LocalDatabase->isOpen())
     {
         m_LocalIndexer->addDirectory(*m_LocalDatabase,dicomData,m_LocalDatabase->databaseDirectory());
     }
 }
 
 void QmitkDicomLocalStorageWidget::OnStartDicomImport(const QStringList& dicomData)
 {
     if(m_LocalDatabase->isOpen())
     {
         m_ProgressDialog->show();
         m_LocalIndexer->addListOfFiles(*m_LocalDatabase,dicomData,m_LocalDatabase->databaseDirectory());
     }
 }
 
 void QmitkDicomLocalStorageWidget::OnFinishedImport()
 {
     m_ProgressDialog->setValue(m_ProgressDialog->maximum());
 }
 
 void QmitkDicomLocalStorageWidget::OnDeleteButtonClicked()
 {
   QStringList selectedSeriesUIDs = m_Controls->ctkDicomBrowser->currentSeriesSelection();
   QString uid;
   foreach (uid, selectedSeriesUIDs)
   {
     m_LocalDatabase->removeSeries(uid);
   }
   QStringList selectedStudiesUIDs = m_Controls->ctkDicomBrowser->currentStudiesSelection();
   foreach(uid, selectedStudiesUIDs)
   {
     m_LocalDatabase->removeStudy(uid);
   }
   QStringList selectedPatientUIDs = m_Controls->ctkDicomBrowser->currentPatientsSelection();
   foreach(uid, selectedPatientUIDs)
   {
     m_LocalDatabase->removePatient(uid);
   }
   m_Controls->ctkDicomBrowser->updateTableViews();
 }
 
 void QmitkDicomLocalStorageWidget::OnViewButtonClicked()
 {
   QStringList uids = m_Controls->ctkDicomBrowser->currentSeriesSelection();
   QString uid;
   foreach (uid, uids)
   {
     QStringList filesForSeries = m_LocalDatabase->filesForSeries(uid);
     QHash<QString, QVariant> eventProperty;
     eventProperty.insert("FilesForSeries", filesForSeries);
     emit SignalDicomToDataManager(eventProperty);
   }
 }
 
 void QmitkDicomLocalStorageWidget::SetDatabaseDirectory(QString newDatatbaseDirectory)
 {
     QDir databaseDirecory = QDir(newDatatbaseDirectory);
     if(!databaseDirecory.exists())
     {
         databaseDirecory.mkpath(databaseDirecory.absolutePath());
     }
     QString newDatatbaseFile = databaseDirecory.absolutePath() + QString("/ctkDICOM.sql");
     this->SetDatabase(newDatatbaseFile);
 }
 
 void QmitkDicomLocalStorageWidget::SetDatabase(QString databaseFile)
 {
     m_LocalDatabase = new ctkDICOMDatabase(databaseFile);
     m_LocalDatabase->setParent(this);
     m_Controls->ctkDicomBrowser->setDICOMDatabase(m_LocalDatabase);
 }
 
 void QmitkDicomLocalStorageWidget::OnSeriesSelectionChanged(const QStringList &s)
 {
   m_Controls->viewInternalDataButton->setEnabled((s.size() != 0));
 }
 
 void QmitkDicomLocalStorageWidget::SetupProgressDialog(QWidget* parent)
 {
     m_ProgressDialog = new QProgressDialog("DICOM Import", "Cancel", 0, 100, parent,Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
     m_ProgressDialogLabel = new QLabel("Initialization...", m_ProgressDialog);
     m_ProgressDialog->setLabel(m_ProgressDialogLabel);
     m_ProgressDialog->setWindowModality(Qt::ApplicationModal);
     m_ProgressDialog->setMinimumDuration(0);
 }
diff --git a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditorControls.ui b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditorControls.ui
index 117b7740b7..d98a41b59a 100644
--- a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditorControls.ui
+++ b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditorControls.ui
@@ -1,218 +1,307 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkDicomEditorControls</class>
  <widget class="QWidget" name="QmitkDicomEditorControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>752</width>
     <height>696</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="acceptDrops">
    <bool>false</bool>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_8">
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QTabWidget" name="tabWidget">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="tabPosition">
-         <enum>QTabWidget::North</enum>
-        </property>
-        <property name="tabShape">
-         <enum>QTabWidget::Rounded</enum>
-        </property>
-        <property name="currentIndex">
-         <number>1</number>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <widget class="QWidget" name="tabWidgetPage1">
-         <attribute name="icon">
-          <iconset resource="../../resources/dicom.qrc">
-           <normaloff>:/org.mitk.gui.qt.dicom/drive-harddisk_32.png</normaloff>:/org.mitk.gui.qt.dicom/drive-harddisk_32.png</iconset>
-         </attribute>
-         <attribute name="title">
-          <string>Local Storage</string>
-         </attribute>
-         <attribute name="toolTip">
-          <string>Manage your local dicom imports</string>
-         </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <item>
-           <widget class="QmitkDicomLocalStorageWidget" name="internalDataWidget" native="true"/>
-          </item>
-         </layout>
+     <widget class="QWidget" name="scrollAreaWidgetContents_2">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>738</width>
+        <height>682</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QTabWidget" name="tabWidget">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="tabPosition">
+          <enum>QTabWidget::North</enum>
+         </property>
+         <property name="tabShape">
+          <enum>QTabWidget::Rounded</enum>
+         </property>
+         <property name="currentIndex">
+          <number>2</number>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+         <widget class="QWidget" name="tabWidgetPage1">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <attribute name="icon">
+           <iconset resource="../../resources/dicom.qrc">
+            <normaloff>:/org.mitk.gui.qt.dicom/drive-harddisk_32.png</normaloff>:/org.mitk.gui.qt.dicom/drive-harddisk_32.png</iconset>
+          </attribute>
+          <attribute name="title">
+           <string>Local Storage</string>
+          </attribute>
+          <attribute name="toolTip">
+           <string>Manage your local dicom imports</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <item>
+            <widget class="QmitkDicomLocalStorageWidget" name="internalDataWidget" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tabWidgetPage2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <attribute name="icon">
+           <iconset resource="../../resources/dicom.qrc">
+            <normaloff>:/org.mitk.gui.qt.dicom/import_32.png</normaloff>
+            <selectedon>:/org.mitk.gui.qt.dicom/import_32.png</selectedon>:/org.mitk.gui.qt.dicom/import_32.png</iconset>
+          </attribute>
+          <attribute name="title">
+           <string>Import</string>
+          </attribute>
+          <attribute name="toolTip">
+           <string>Import dicom data from any hard drive</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_9">
+           <item>
+            <widget class="QmitkDicomExternalDataWidget" name="externalDataWidget" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tabWidgetPage3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <attribute name="icon">
+           <iconset resource="../../resources/dicom.qrc">
+            <normaloff>:/org.mitk.gui.qt.dicom/network-workgroup_32.png</normaloff>:/org.mitk.gui.qt.dicom/network-workgroup_32.png</iconset>
+          </attribute>
+          <attribute name="title">
+           <string>Query Retrieve</string>
+          </attribute>
+          <attribute name="toolTip">
+           <string>Query and retrieve dicom data from server</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_12">
+           <item>
+            <widget class="QLabel" name="label">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="styleSheet">
+              <string notr="true">color: rgb(255, 0, 0);</string>
+             </property>
+             <property name="text">
+              <string>Warning: This is currently an experimental feature!</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ctkDICOMQueryRetrieveWidget" name="m_ctkDICOMQueryRetrieveWidget" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
         </widget>
-        <widget class="QWidget" name="tabWidgetPage2">
-         <attribute name="icon">
-          <iconset resource="../../resources/dicom.qrc">
-           <normaloff>:/org.mitk.gui.qt.dicom/import_32.png</normaloff>
-           <selectedon>:/org.mitk.gui.qt.dicom/import_32.png</selectedon>:/org.mitk.gui.qt.dicom/import_32.png</iconset>
-         </attribute>
-         <attribute name="title">
-          <string>Import</string>
-         </attribute>
-         <attribute name="toolTip">
-          <string>Import dicom data from any hard drive</string>
-         </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_9">
+       </item>
+       <item>
+        <widget class="QFrame" name="frame_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
           <item>
-           <widget class="QmitkDicomExternalDataWidget" name="externalDataWidget" native="true"/>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Minimum</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>4</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
           </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="tabWidgetPage3">
-         <attribute name="icon">
-          <iconset resource="../../resources/dicom.qrc">
-           <normaloff>:/org.mitk.gui.qt.dicom/network-workgroup_32.png</normaloff>:/org.mitk.gui.qt.dicom/network-workgroup_32.png</iconset>
-         </attribute>
-         <attribute name="title">
-          <string>Query Retrieve</string>
-         </attribute>
-         <attribute name="toolTip">
-          <string>Query and retrieve dicom data from server</string>
-         </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_12">
           <item>
-           <widget class="QLabel" name="label">
+           <widget class="QLabel" name="StoreSCPStatusLabel">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="styleSheet">
-             <string notr="true">color: rgb(255, 0, 0);</string>
-            </property>
             <property name="text">
-             <string>Warning: This is currently an experimental feature!</string>
+             <string/>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::RichText</enum>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="ctkDICOMQueryRetrieveWidget" name="m_ctkDICOMQueryRetrieveWidget" native="true"/>
+           <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>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame_2">
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="spacing">
-          <number>0</number>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="margin">
-          <number>0</number>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
          </property>
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Minimum</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>4</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="StoreSCPStatusLabel">
-           <property name="text">
-            <string/>
-           </property>
-           <property name="textFormat">
-            <enum>Qt::RichText</enum>
-           </property>
-          </widget>
-         </item>
-         <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>
-        </layout>
-       </widget>
-      </item>
-     </layout>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>ctkDICOMQueryRetrieveWidget</class>
    <extends>QWidget</extends>
    <header>ctkDICOMQueryRetrieveWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkDicomLocalStorageWidget</class>
    <extends>QWidget</extends>
    <header>Qmitk/QmitkDicomLocalStorageWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkDicomExternalDataWidget</class>
    <extends>QWidget</extends>
    <header>Qmitk/QmitkDicomExternalDataWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../../resources/dicom.qrc"/>
  </resources>
  <connections/>
  <slots>
   <slot>OnChangePage(int)</slot>
  </slots>
 </ui>