Index: src/sas/qtgui/UI/DataExplorer.py
===================================================================
--- src/sas/qtgui/UI/DataExplorer.py	(revision f721030e66e61dc6279aa8e024da03b25f8e0d42)
+++ 	(revision )
@@ -1,148 +1,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'DataExplorer.ui'
-#
-# Created by: PyQt4 UI code generator 4.11.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
-
-class Ui_DataExplorerUI(object):
-    def setupUi(self, DataExplorerUI):
-        DataExplorerUI.setObjectName(_fromUtf8("DataExplorerUI"))
-        DataExplorerUI.resize(488, 589)
-        self.gridLayout_4 = QtGui.QGridLayout(DataExplorerUI)
-        self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4"))
-        self.label = QtGui.QLabel(DataExplorerUI)
-        self.label.setObjectName(_fromUtf8("label"))
-        self.gridLayout_4.addWidget(self.label, 0, 0, 1, 1)
-        self.comboBox = QtGui.QComboBox(DataExplorerUI)
-        self.comboBox.setObjectName(_fromUtf8("comboBox"))
-        self.comboBox.addItem(_fromUtf8(""))
-        self.comboBox.addItem(_fromUtf8(""))
-        self.comboBox.addItem(_fromUtf8(""))
-        self.comboBox.addItem(_fromUtf8(""))
-        self.comboBox.addItem(_fromUtf8(""))
-        self.comboBox.addItem(_fromUtf8(""))
-        self.gridLayout_4.addWidget(self.comboBox, 1, 0, 1, 1)
-        spacerItem = QtGui.QSpacerItem(278, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_4.addItem(spacerItem, 1, 1, 1, 1)
-        self.groupBox = QtGui.QGroupBox(DataExplorerUI)
-        self.groupBox.setObjectName(_fromUtf8("groupBox"))
-        self.gridLayout = QtGui.QGridLayout(self.groupBox)
-        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
-        self.treeView = QtGui.QTreeView(self.groupBox)
-        self.treeView.setObjectName(_fromUtf8("treeView"))
-        self.gridLayout.addWidget(self.treeView, 0, 0, 1, 1)
-        self.verticalLayout = QtGui.QVBoxLayout()
-        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.pushButton = QtGui.QPushButton(self.groupBox)
-        self.pushButton.setObjectName(_fromUtf8("pushButton"))
-        self.verticalLayout.addWidget(self.pushButton)
-        self.pushButton_2 = QtGui.QPushButton(self.groupBox)
-        self.pushButton_2.setObjectName(_fromUtf8("pushButton_2"))
-        self.verticalLayout.addWidget(self.pushButton_2)
-        spacerItem1 = QtGui.QSpacerItem(20, 141, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem1)
-        self.gridLayout.addLayout(self.verticalLayout, 0, 1, 1, 1)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
-        self.pushButton_6 = QtGui.QPushButton(self.groupBox)
-        self.pushButton_6.setObjectName(_fromUtf8("pushButton_6"))
-        self.horizontalLayout.addWidget(self.pushButton_6)
-        self.comboBox_3 = QtGui.QComboBox(self.groupBox)
-        self.comboBox_3.setObjectName(_fromUtf8("comboBox_3"))
-        self.comboBox_3.addItem(_fromUtf8(""))
-        self.comboBox_3.addItem(_fromUtf8(""))
-        self.comboBox_3.addItem(_fromUtf8(""))
-        self.horizontalLayout.addWidget(self.comboBox_3)
-        self.checkBox = QtGui.QCheckBox(self.groupBox)
-        self.checkBox.setObjectName(_fromUtf8("checkBox"))
-        self.horizontalLayout.addWidget(self.checkBox)
-        spacerItem2 = QtGui.QSpacerItem(197, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem2)
-        self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 2)
-        self.gridLayout_4.addWidget(self.groupBox, 2, 0, 1, 2)
-        self.groupBox_2 = QtGui.QGroupBox(DataExplorerUI)
-        self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
-        self.gridLayout_2 = QtGui.QGridLayout(self.groupBox_2)
-        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
-        self.listView = QtGui.QListView(self.groupBox_2)
-        self.listView.setObjectName(_fromUtf8("listView"))
-        self.gridLayout_2.addWidget(self.listView, 0, 0, 2, 1)
-        self.pushButton_3 = QtGui.QPushButton(self.groupBox_2)
-        self.pushButton_3.setObjectName(_fromUtf8("pushButton_3"))
-        self.gridLayout_2.addWidget(self.pushButton_3, 0, 1, 1, 1)
-        spacerItem3 = QtGui.QSpacerItem(20, 198, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem3, 1, 1, 1, 1)
-        self.gridLayout_4.addWidget(self.groupBox_2, 3, 0, 1, 2)
-        self.groupBox_3 = QtGui.QGroupBox(DataExplorerUI)
-        self.groupBox_3.setObjectName(_fromUtf8("groupBox_3"))
-        self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_3)
-        self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3"))
-        self.pushButton_4 = QtGui.QPushButton(self.groupBox_3)
-        self.pushButton_4.setObjectName(_fromUtf8("pushButton_4"))
-        self.gridLayout_3.addWidget(self.pushButton_4, 0, 0, 1, 1)
-        self.pushButton_5 = QtGui.QPushButton(self.groupBox_3)
-        self.pushButton_5.setObjectName(_fromUtf8("pushButton_5"))
-        self.gridLayout_3.addWidget(self.pushButton_5, 1, 0, 1, 1)
-        self.comboBox_2 = QtGui.QComboBox(self.groupBox_3)
-        self.comboBox_2.setObjectName(_fromUtf8("comboBox_2"))
-        self.comboBox_2.addItem(_fromUtf8(""))
-        self.gridLayout_3.addWidget(self.comboBox_2, 1, 1, 1, 1)
-        self.gridLayout_4.addWidget(self.groupBox_3, 4, 0, 1, 1)
-        self.groupBox_3.raise_()
-        self.groupBox_2.raise_()
-        self.groupBox.raise_()
-        self.comboBox.raise_()
-        self.label.raise_()
-
-        self.retranslateUi(DataExplorerUI)
-        QtCore.QMetaObject.connectSlotsByName(DataExplorerUI)
-
-    def retranslateUi(self, DataExplorerUI):
-        DataExplorerUI.setWindowTitle(_translate("DataExplorerUI", "Dialog", None))
-        self.label.setText(_translate("DataExplorerUI", "Selection Options", None))
-        self.comboBox.setItemText(0, _translate("DataExplorerUI", "Select all", None))
-        self.comboBox.setItemText(1, _translate("DataExplorerUI", "Unselect all", None))
-        self.comboBox.setItemText(2, _translate("DataExplorerUI", "Select all 1D", None))
-        self.comboBox.setItemText(3, _translate("DataExplorerUI", "Unselect all 1D", None))
-        self.comboBox.setItemText(4, _translate("DataExplorerUI", "Select all 2D", None))
-        self.comboBox.setItemText(5, _translate("DataExplorerUI", "Unselect all 2D", None))
-        self.groupBox.setTitle(_translate("DataExplorerUI", "Data", None))
-        self.pushButton.setText(_translate("DataExplorerUI", "Load", None))
-        self.pushButton_2.setText(_translate("DataExplorerUI", "Delete", None))
-        self.pushButton_6.setText(_translate("DataExplorerUI", "Send to", None))
-        self.comboBox_3.setItemText(0, _translate("DataExplorerUI", "Fitting", None))
-        self.comboBox_3.setItemText(1, _translate("DataExplorerUI", "Pr inversion", None))
-        self.comboBox_3.setItemText(2, _translate("DataExplorerUI", "Invariant", None))
-        self.checkBox.setText(_translate("DataExplorerUI", "Batch mode", None))
-        self.groupBox_2.setTitle(_translate("DataExplorerUI", "Theory", None))
-        self.pushButton_3.setText(_translate("DataExplorerUI", "Freeze", None))
-        self.groupBox_3.setTitle(_translate("DataExplorerUI", "Plot", None))
-        self.pushButton_4.setText(_translate("DataExplorerUI", "New", None))
-        self.pushButton_5.setText(_translate("DataExplorerUI", "Append to", None))
-        self.comboBox_2.setItemText(0, _translate("DataExplorerUI", "Graph1", None))
-
-
-class DataExplorerUI(QtGui.QDialog, Ui_DataExplorerUI):
-    def __init__(self, parent=None, f=QtCore.Qt.WindowFlags()):
-        QtGui.QDialog.__init__(self, parent, f)
-
-        self.setupUi(self)
-
Index: src/sas/qtgui/UI/DataExplorerUI.py
===================================================================
--- src/sas/qtgui/UI/DataExplorerUI.py	(revision 481ff261d4487dbfcc8eabb342125294e0c6f514)
+++ src/sas/qtgui/UI/DataExplorerUI.py	(revision 481ff261d4487dbfcc8eabb342125294e0c6f514)
@@ -0,0 +1,237 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'DataExplorerUI.ui'
+#
+# Created by: PyQt4 UI code generator 4.11.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_DataLoadWidget(object):
+    def setupUi(self, DataLoadWidget):
+        DataLoadWidget.setObjectName(_fromUtf8("DataLoadWidget"))
+        DataLoadWidget.resize(517, 693)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(DataLoadWidget.sizePolicy().hasHeightForWidth())
+        DataLoadWidget.setSizePolicy(sizePolicy)
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/res/ball.ico")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        DataLoadWidget.setWindowIcon(icon)
+        self.dataTab = QtGui.QWidget()
+        self.dataTab.setObjectName(_fromUtf8("dataTab"))
+        self.gridLayout_6 = QtGui.QGridLayout(self.dataTab)
+        self.gridLayout_6.setObjectName(_fromUtf8("gridLayout_6"))
+        self.groupBox = QtGui.QGroupBox(self.dataTab)
+        self.groupBox.setObjectName(_fromUtf8("groupBox"))
+        self.gridLayout = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.horizontalLayout_2 = QtGui.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
+        self.cmdLoad = QtGui.QPushButton(self.groupBox)
+        self.cmdLoad.setObjectName(_fromUtf8("cmdLoad"))
+        self.horizontalLayout_2.addWidget(self.cmdLoad)
+        self.cbSelect = QtGui.QComboBox(self.groupBox)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.cbSelect.sizePolicy().hasHeightForWidth())
+        self.cbSelect.setSizePolicy(sizePolicy)
+        self.cbSelect.setObjectName(_fromUtf8("cbSelect"))
+        self.cbSelect.addItem(_fromUtf8(""))
+        self.cbSelect.addItem(_fromUtf8(""))
+        self.cbSelect.addItem(_fromUtf8(""))
+        self.cbSelect.addItem(_fromUtf8(""))
+        self.cbSelect.addItem(_fromUtf8(""))
+        self.cbSelect.addItem(_fromUtf8(""))
+        self.horizontalLayout_2.addWidget(self.cbSelect)
+        spacerItem = QtGui.QSpacerItem(128, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem)
+        self.cmdDeleteData = QtGui.QPushButton(self.groupBox)
+        self.cmdDeleteData.setObjectName(_fromUtf8("cmdDeleteData"))
+        self.horizontalLayout_2.addWidget(self.cmdDeleteData)
+        self.gridLayout.addLayout(self.horizontalLayout_2, 0, 0, 1, 1)
+        self.treeView = QtGui.QTreeView(self.groupBox)
+        self.treeView.setAcceptDrops(True)
+        self.treeView.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
+        self.treeView.setDragEnabled(True)
+        self.treeView.setDragDropOverwriteMode(True)
+        self.treeView.setDragDropMode(QtGui.QAbstractItemView.DropOnly)
+        self.treeView.setDefaultDropAction(QtCore.Qt.CopyAction)
+        self.treeView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+        self.treeView.setObjectName(_fromUtf8("treeView"))
+        self.treeView.header().setVisible(False)
+        self.gridLayout.addWidget(self.treeView, 1, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.cmdFreeze = QtGui.QPushButton(self.groupBox)
+        self.cmdFreeze.setObjectName(_fromUtf8("cmdFreeze"))
+        self.horizontalLayout.addWidget(self.cmdFreeze)
+        spacerItem1 = QtGui.QSpacerItem(58, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.cmdSendTo = QtGui.QToolButton(self.groupBox)
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/res/file_send-128.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cmdSendTo.setIcon(icon1)
+        self.cmdSendTo.setIconSize(QtCore.QSize(32, 32))
+        self.cmdSendTo.setObjectName(_fromUtf8("cmdSendTo"))
+        self.horizontalLayout.addWidget(self.cmdSendTo)
+        self.cbFitting = QtGui.QComboBox(self.groupBox)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.cbFitting.sizePolicy().hasHeightForWidth())
+        self.cbFitting.setSizePolicy(sizePolicy)
+        self.cbFitting.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.cbFitting.setObjectName(_fromUtf8("cbFitting"))
+        self.cbFitting.addItem(_fromUtf8(""))
+        self.cbFitting.addItem(_fromUtf8(""))
+        self.cbFitting.addItem(_fromUtf8(""))
+        self.horizontalLayout.addWidget(self.cbFitting)
+        self.chkBatch = QtGui.QCheckBox(self.groupBox)
+        self.chkBatch.setObjectName(_fromUtf8("chkBatch"))
+        self.horizontalLayout.addWidget(self.chkBatch)
+        self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 1)
+        self.gridLayout_6.addWidget(self.groupBox, 0, 0, 1, 1)
+        self.gridLayout_2 = QtGui.QGridLayout()
+        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.groupBox_3 = QtGui.QGroupBox(self.dataTab)
+        self.groupBox_3.setObjectName(_fromUtf8("groupBox_3"))
+        self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_3)
+        self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3"))
+        self.cmdNew = QtGui.QPushButton(self.groupBox_3)
+        self.cmdNew.setObjectName(_fromUtf8("cmdNew"))
+        self.gridLayout_3.addWidget(self.cmdNew, 0, 0, 1, 1)
+        self.cmdAppend = QtGui.QPushButton(self.groupBox_3)
+        self.cmdAppend.setObjectName(_fromUtf8("cmdAppend"))
+        self.gridLayout_3.addWidget(self.cmdAppend, 1, 0, 1, 1)
+        self.cbgraph = QtGui.QComboBox(self.groupBox_3)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.cbgraph.sizePolicy().hasHeightForWidth())
+        self.cbgraph.setSizePolicy(sizePolicy)
+        self.cbgraph.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.cbgraph.setObjectName(_fromUtf8("cbgraph"))
+        self.cbgraph.addItem(_fromUtf8(""))
+        self.gridLayout_3.addWidget(self.cbgraph, 1, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.groupBox_3, 0, 0, 1, 1)
+        spacerItem2 = QtGui.QSpacerItem(108, 111, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem2, 0, 1, 1, 1)
+        self.cmdHelp = QtGui.QPushButton(self.dataTab)
+        self.cmdHelp.setObjectName(_fromUtf8("cmdHelp"))
+        self.gridLayout_2.addWidget(self.cmdHelp, 0, 2, 1, 1, QtCore.Qt.AlignBottom)
+        self.gridLayout_6.addLayout(self.gridLayout_2, 1, 0, 1, 1)
+        DataLoadWidget.addTab(self.dataTab, _fromUtf8(""))
+        self.theoryTab = QtGui.QWidget()
+        self.theoryTab.setObjectName(_fromUtf8("theoryTab"))
+        self.gridLayout_8 = QtGui.QGridLayout(self.theoryTab)
+        self.gridLayout_8.setObjectName(_fromUtf8("gridLayout_8"))
+        self.groupBox_2 = QtGui.QGroupBox(self.theoryTab)
+        self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
+        self.gridLayout_4 = QtGui.QGridLayout(self.groupBox_2)
+        self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4"))
+        self.horizontalLayout_3 = QtGui.QHBoxLayout()
+        self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
+        spacerItem3 = QtGui.QSpacerItem(353, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem3)
+        self.cmdDeleteTheory = QtGui.QPushButton(self.groupBox_2)
+        self.cmdDeleteTheory.setObjectName(_fromUtf8("cmdDeleteTheory"))
+        self.horizontalLayout_3.addWidget(self.cmdDeleteTheory)
+        self.gridLayout_4.addLayout(self.horizontalLayout_3, 0, 0, 1, 1)
+        self.freezeView = QtGui.QTreeView(self.groupBox_2)
+        self.freezeView.setObjectName(_fromUtf8("freezeView"))
+        self.freezeView.header().setVisible(False)
+        self.gridLayout_4.addWidget(self.freezeView, 1, 0, 1, 1)
+        self.gridLayout_8.addWidget(self.groupBox_2, 0, 0, 1, 1)
+        self.gridLayout_5 = QtGui.QGridLayout()
+        self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5"))
+        self.groupBox_4 = QtGui.QGroupBox(self.theoryTab)
+        self.groupBox_4.setObjectName(_fromUtf8("groupBox_4"))
+        self.gridLayout_7 = QtGui.QGridLayout(self.groupBox_4)
+        self.gridLayout_7.setObjectName(_fromUtf8("gridLayout_7"))
+        self.cmdNew_2 = QtGui.QPushButton(self.groupBox_4)
+        self.cmdNew_2.setObjectName(_fromUtf8("cmdNew_2"))
+        self.gridLayout_7.addWidget(self.cmdNew_2, 0, 0, 1, 1)
+        self.cmdAppend_2 = QtGui.QPushButton(self.groupBox_4)
+        self.cmdAppend_2.setObjectName(_fromUtf8("cmdAppend_2"))
+        self.gridLayout_7.addWidget(self.cmdAppend_2, 1, 0, 1, 1)
+        self.cbgraph_2 = QtGui.QComboBox(self.groupBox_4)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.cbgraph_2.sizePolicy().hasHeightForWidth())
+        self.cbgraph_2.setSizePolicy(sizePolicy)
+        self.cbgraph_2.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.cbgraph_2.setObjectName(_fromUtf8("cbgraph_2"))
+        self.cbgraph_2.addItem(_fromUtf8(""))
+        self.gridLayout_7.addWidget(self.cbgraph_2, 1, 1, 1, 1)
+        self.gridLayout_5.addWidget(self.groupBox_4, 0, 0, 1, 1)
+        spacerItem4 = QtGui.QSpacerItem(108, 111, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_5.addItem(spacerItem4, 0, 1, 1, 1)
+        self.cmdHelp_2 = QtGui.QPushButton(self.theoryTab)
+        self.cmdHelp_2.setObjectName(_fromUtf8("cmdHelp_2"))
+        self.gridLayout_5.addWidget(self.cmdHelp_2, 0, 2, 1, 1, QtCore.Qt.AlignBottom)
+        self.gridLayout_8.addLayout(self.gridLayout_5, 1, 0, 1, 1)
+        DataLoadWidget.addTab(self.theoryTab, _fromUtf8(""))
+
+        self.retranslateUi(DataLoadWidget)
+        DataLoadWidget.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(DataLoadWidget)
+
+    def retranslateUi(self, DataLoadWidget):
+        DataLoadWidget.setWindowTitle(_translate("DataLoadWidget", "TabWidget", None))
+        self.groupBox.setTitle(_translate("DataLoadWidget", "Data", None))
+        self.cmdLoad.setText(_translate("DataLoadWidget", "Load", None))
+        self.cbSelect.setItemText(0, _translate("DataLoadWidget", "Select all", None))
+        self.cbSelect.setItemText(1, _translate("DataLoadWidget", "Unselect all", None))
+        self.cbSelect.setItemText(2, _translate("DataLoadWidget", "Select all 1D", None))
+        self.cbSelect.setItemText(3, _translate("DataLoadWidget", "Unselect all 1D", None))
+        self.cbSelect.setItemText(4, _translate("DataLoadWidget", "Select all 2D", None))
+        self.cbSelect.setItemText(5, _translate("DataLoadWidget", "Unselect all 2D", None))
+        self.cmdDeleteData.setText(_translate("DataLoadWidget", "Delete", None))
+        self.cmdFreeze.setText(_translate("DataLoadWidget", "Freeze Theory", None))
+        self.cmdSendTo.setText(_translate("DataLoadWidget", "...", None))
+        self.cbFitting.setItemText(0, _translate("DataLoadWidget", "Fitting", None))
+        self.cbFitting.setItemText(1, _translate("DataLoadWidget", "Pr inversion", None))
+        self.cbFitting.setItemText(2, _translate("DataLoadWidget", "Invariant", None))
+        self.chkBatch.setText(_translate("DataLoadWidget", "Batch mode", None))
+        self.groupBox_3.setTitle(_translate("DataLoadWidget", "Plot", None))
+        self.cmdNew.setText(_translate("DataLoadWidget", "Create New", None))
+        self.cmdAppend.setText(_translate("DataLoadWidget", "Append to", None))
+        self.cbgraph.setItemText(0, _translate("DataLoadWidget", "Graph1", None))
+        self.cmdHelp.setText(_translate("DataLoadWidget", "Help", None))
+        DataLoadWidget.setTabText(DataLoadWidget.indexOf(self.dataTab), _translate("DataLoadWidget", "Data", None))
+        self.groupBox_2.setTitle(_translate("DataLoadWidget", "Theory", None))
+        self.cmdDeleteTheory.setText(_translate("DataLoadWidget", "Delete", None))
+        self.groupBox_4.setTitle(_translate("DataLoadWidget", "Plot", None))
+        self.cmdNew_2.setText(_translate("DataLoadWidget", "Create New", None))
+        self.cmdAppend_2.setText(_translate("DataLoadWidget", "Append to", None))
+        self.cbgraph_2.setItemText(0, _translate("DataLoadWidget", "Graph1", None))
+        self.cmdHelp_2.setText(_translate("DataLoadWidget", "Help", None))
+        DataLoadWidget.setTabText(DataLoadWidget.indexOf(self.theoryTab), _translate("DataLoadWidget", "Theory", None))
+
+import main_resources_rc
+
+class DataLoadWidget(QtGui.QTabWidget, Ui_DataLoadWidget):
+    def __init__(self, parent=None, f=QtCore.Qt.WindowFlags()):
+        QtGui.QTabWidget.__init__(self, parent)
+
+        self.setupUi(self)
+
Index: src/sas/qtgui/UI/DataExplorerUI.ui
===================================================================
--- src/sas/qtgui/UI/DataExplorerUI.ui	(revision f721030e66e61dc6279aa8e024da03b25f8e0d42)
+++ src/sas/qtgui/UI/DataExplorerUI.ui	(revision 481ff261d4487dbfcc8eabb342125294e0c6f514)
@@ -1,263 +1,402 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DataExplorerUI</class>
- <widget class="QDialog" name="DataExplorerUI">
+ <class>DataLoadWidget</class>
+ <widget class="QTabWidget" name="DataLoadWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>454</width>
-    <height>577</height>
+    <width>517</width>
+    <height>693</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>TabWidget</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Selection Options</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QComboBox" name="comboBox">
-     <item>
-      <property name="text">
-       <string>Select all</string>
+  <property name="windowIcon">
+   <iconset resource="main_resources.qrc">
+    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
+  </property>
+  <property name="currentIndex">
+   <number>0</number>
+  </property>
+  <widget class="QWidget" name="dataTab">
+   <attribute name="title">
+    <string>Data</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout_6">
+    <item row="0" column="0">
+     <widget class="QGroupBox" name="groupBox">
+      <property name="title">
+       <string>Data</string>
       </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Unselect all</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Select all 1D</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Unselect all 1D</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Select all 2D</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Unselect all 2D</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>278</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Data</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="0" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QPushButton" name="cmdLoad">
+           <property name="text">
+            <string>Load</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="cbSelect">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <item>
+            <property name="text">
+             <string>Select all</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Unselect all</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Select all 1D</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Unselect all 1D</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Select all 2D</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Unselect all 2D</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_7">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>128</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cmdDeleteData">
+           <property name="text">
+            <string>Delete</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0">
+        <widget class="QTreeView" name="treeView">
+         <property name="acceptDrops">
+          <bool>true</bool>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropOverwriteMode">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DropOnly</enum>
+         </property>
+         <property name="defaultDropAction">
+          <enum>Qt::CopyAction</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QPushButton" name="cmdFreeze">
+           <property name="text">
+            <string>Freeze Theory</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>58</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QToolButton" name="cmdSendTo">
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="main_resources.qrc">
+             <normaloff>:/res/file_send-128.png</normaloff>:/res/file_send-128.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="cbFitting">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="sizeAdjustPolicy">
+            <enum>QComboBox::AdjustToContents</enum>
+           </property>
+           <item>
+            <property name="text">
+             <string>Fitting</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Pr inversion</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Invariant</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="chkBatch">
+           <property name="text">
+            <string>Batch mode</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
-       <widget class="QTreeView" name="treeView">
-        <property name="dragEnabled">
-         <bool>true</bool>
-        </property>
-        <property name="dragDropMode">
-         <enum>QAbstractItemView::DragDrop</enum>
-        </property>
-        <property name="defaultDropAction">
-         <enum>Qt::CopyAction</enum>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::ExtendedSelection</enum>
-        </property>
+       <widget class="QGroupBox" name="groupBox_3">
+        <property name="title">
+         <string>Plot</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="0" column="0">
+          <widget class="QPushButton" name="cmdNew">
+           <property name="text">
+            <string>Create New</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QPushButton" name="cmdAppend">
+           <property name="text">
+            <string>Append to</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QComboBox" name="cbgraph">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="sizeAdjustPolicy">
+            <enum>QComboBox::AdjustToContents</enum>
+           </property>
+           <item>
+            <property name="text">
+             <string>Graph1</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
       <item row="0" column="1">
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QPushButton" name="pushButton">
-          <property name="text">
-           <string>Load</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_2">
-          <property name="text">
-           <string>Delete</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>141</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QPushButton" name="pushButton_6">
-          <property name="text">
-           <string>Send to</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="comboBox_3">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name="text">
-            <string>Fitting</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Pr inversion</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Invariant</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="checkBox">
-          <property name="text">
-           <string>Batch mode</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>197</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Theory</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0" rowspan="2">
-       <widget class="QListView" name="listView"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="pushButton_3">
-        <property name="text">
-         <string>Freeze</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <spacer name="verticalSpacer">
+       <spacer name="horizontalSpacer_3">
         <property name="orientation">
-         <enum>Qt::Vertical</enum>
+         <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>20</width>
-          <height>198</height>
+          <width>108</width>
+          <height>111</height>
          </size>
         </property>
        </spacer>
       </item>
+      <item row="0" column="2" alignment="Qt::AlignBottom">
+       <widget class="QPushButton" name="cmdHelp">
+        <property name="text">
+         <string>Help</string>
+        </property>
+       </widget>
+      </item>
      </layout>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="title">
-      <string>Plot</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="theoryTab">
+   <attribute name="title">
+    <string>Theory</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout_8">
+    <item row="0" column="0">
+     <widget class="QGroupBox" name="groupBox_2">
+      <property name="title">
+       <string>Theory</string>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <item row="0" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <spacer name="horizontalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>353</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cmdDeleteTheory">
+           <property name="text">
+            <string>Delete</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0">
+        <widget class="QTreeView" name="freezeView">
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <layout class="QGridLayout" name="gridLayout_5">
       <item row="0" column="0">
-       <widget class="QPushButton" name="pushButton_4">
+       <widget class="QGroupBox" name="groupBox_4">
+        <property name="title">
+         <string>Plot</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_7">
+         <item row="0" column="0">
+          <widget class="QPushButton" name="cmdNew_2">
+           <property name="text">
+            <string>Create New</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QPushButton" name="cmdAppend_2">
+           <property name="text">
+            <string>Append to</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QComboBox" name="cbgraph_2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="sizeAdjustPolicy">
+            <enum>QComboBox::AdjustToContents</enum>
+           </property>
+           <item>
+            <property name="text">
+             <string>Graph1</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>108</width>
+          <height>111</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="2" alignment="Qt::AlignBottom">
+       <widget class="QPushButton" name="cmdHelp_2">
         <property name="text">
-         <string>New</string>
+         <string>Help</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="pushButton_5">
-        <property name="text">
-         <string>Append to</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBox_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <item>
-         <property name="text">
-          <string>Graph1</string>
-         </property>
-        </item>
-       </widget>
-      </item>
      </layout>
-    </widget>
-   </item>
-  </layout>
-  <zorder>groupBox_3</zorder>
-  <zorder>groupBox_2</zorder>
-  <zorder>groupBox</zorder>
-  <zorder>comboBox</zorder>
-  <zorder>label</zorder>
-  <zorder>horizontalSpacer_2</zorder>
+    </item>
+   </layout>
+  </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="main_resources.qrc"/>
+ </resources>
  <connections/>
 </ui>
Index: src/sas/qtgui/UI/TabbedFileLoadUI.py
===================================================================
--- src/sas/qtgui/UI/TabbedFileLoadUI.py	(revision f82ab8cebb48e29a3c2598340d12929e037d764c)
+++ src/sas/qtgui/UI/TabbedFileLoadUI.py	(revision 481ff261d4487dbfcc8eabb342125294e0c6f514)
@@ -133,4 +133,5 @@
         self.freezeView = QtGui.QTreeView(self.groupBox_2)
         self.freezeView.setObjectName(_fromUtf8("freezeView"))
+        self.freezeView.header().setVisible(False)
         self.gridLayout_4.addWidget(self.freezeView, 0, 0, 1, 2)
         self.gridLayout_7.addWidget(self.groupBox_2, 0, 0, 1, 2)
Index: src/sas/qtgui/UI/TabbedFileLoadUI.ui
===================================================================
--- src/sas/qtgui/UI/TabbedFileLoadUI.ui	(revision f82ab8cebb48e29a3c2598340d12929e037d764c)
+++ src/sas/qtgui/UI/TabbedFileLoadUI.ui	(revision 481ff261d4487dbfcc8eabb342125294e0c6f514)
@@ -281,5 +281,9 @@
        </item>
        <item row="0" column="0" colspan="2">
-        <widget class="QTreeView" name="freezeView"/>
+        <widget class="QTreeView" name="freezeView">
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
        </item>
       </layout>
