diff --git a/relational_gui/maingui.py b/relational_gui/maingui.py
index 4382477..93a174a 100644
--- a/relational_gui/maingui.py
+++ b/relational_gui/maingui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'relational_gui/maingui.ui'
 #
-# Created: Sat Oct  8 20:14:44 2011
+# Created: Sun Oct  9 00:27:00 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -105,16 +105,6 @@ class Ui_MainWindow(object):
         self.verticalLayout_6.setSizeConstraint(QtGui.QLayout.SetMinimumSize)
         self.verticalLayout_6.setMargin(0)
         self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6"))
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
-        self.cmdInsert = QtGui.QPushButton(self.layoutWidget1)
-        self.cmdInsert.setObjectName(_fromUtf8("cmdInsert"))
-        self.horizontalLayout.addWidget(self.cmdInsert)
-        self.cmdDelete = QtGui.QPushButton(self.layoutWidget1)
-        self.cmdDelete.setObjectName(_fromUtf8("cmdDelete"))
-        self.horizontalLayout.addWidget(self.cmdDelete)
-        self.verticalLayout_6.addLayout(self.horizontalLayout)
         self.lstHistory = QtGui.QListWidget(self.layoutWidget1)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -208,7 +198,7 @@ class Ui_MainWindow(object):
         self.verticalLayout_7.addLayout(self.horizontalLayout_2)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 20))
         self.menubar.setObjectName(_fromUtf8("menubar"))
         self.menuFile = QtGui.QMenu(self.menubar)
         self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -258,8 +248,6 @@ class Ui_MainWindow(object):
         QtCore.QObject.connect(self.cmdOptimize, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.optimize)
         QtCore.QObject.connect(self.cmdUndoOptimize, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.undoOptimize)
         QtCore.QObject.connect(self.txtResult, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.txtQuery.setFocus)
-        QtCore.QObject.connect(self.cmdDelete, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.deleteTuple)
-        QtCore.QObject.connect(self.cmdInsert, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.insertTuple)
         QtCore.QObject.connect(self.cmdOuterRight, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.addORight)
         QtCore.QObject.connect(self.cmdOuter, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.addOuter)
         QtCore.QObject.connect(self.cmdOuterLeft, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.addOLeft)
@@ -292,9 +280,7 @@ class Ui_MainWindow(object):
         MainWindow.setTabOrder(self.cmdSelection, self.cmdRename)
         MainWindow.setTabOrder(self.cmdRename, self.cmdArrow)
         MainWindow.setTabOrder(self.cmdArrow, self.table)
-        MainWindow.setTabOrder(self.table, self.cmdInsert)
-        MainWindow.setTabOrder(self.cmdInsert, self.cmdDelete)
-        MainWindow.setTabOrder(self.cmdDelete, self.lstHistory)
+        MainWindow.setTabOrder(self.table, self.lstHistory)
         MainWindow.setTabOrder(self.lstHistory, self.cmdOptimize)
         MainWindow.setTabOrder(self.cmdOptimize, self.cmdUndoOptimize)
         MainWindow.setTabOrder(self.cmdUndoOptimize, self.cmdClearHistory)
@@ -327,8 +313,6 @@ class Ui_MainWindow(object):
         self.cmdSelection.setText(QtGui.QApplication.translate("MainWindow", "σ", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdRename.setText(QtGui.QApplication.translate("MainWindow", "ρ", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdArrow.setText(QtGui.QApplication.translate("MainWindow", "➡", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmdInsert.setText(QtGui.QApplication.translate("MainWindow", "Insert", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmdDelete.setText(QtGui.QApplication.translate("MainWindow", "Delete", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdOptimize.setText(QtGui.QApplication.translate("MainWindow", "Optimize", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdUndoOptimize.setText(QtGui.QApplication.translate("MainWindow", "Undo optimize", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdClearHistory.setText(QtGui.QApplication.translate("MainWindow", "Clear history", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/relational_gui/maingui.ui b/relational_gui/maingui.ui
index b8f26dd..e31caf0 100644
--- a/relational_gui/maingui.ui
+++ b/relational_gui/maingui.ui
@@ -196,27 +196,6 @@
           <property name="sizeConstraint">
            <enum>QLayout::SetMinimumSize</enum>
           </property>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetFixedSize</enum>
-            </property>
-            <item>
-             <widget class="QPushButton" name="cmdInsert">
-              <property name="text">
-               <string>Insert</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="cmdDelete">
-              <property name="text">
-               <string>Delete</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
           <item>
            <widget class="QListWidget" name="lstHistory">
             <property name="sizePolicy">
@@ -426,7 +405,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -507,8 +486,6 @@
   <tabstop>cmdRename</tabstop>
   <tabstop>cmdArrow</tabstop>
   <tabstop>table</tabstop>
-  <tabstop>cmdInsert</tabstop>
-  <tabstop>cmdDelete</tabstop>
   <tabstop>lstHistory</tabstop>
   <tabstop>cmdOptimize</tabstop>
   <tabstop>cmdUndoOptimize</tabstop>
@@ -813,38 +790,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>cmdDelete</sender>
-   <signal>clicked()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>deleteTuple()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>549</x>
-     <y>442</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>563</x>
-     <y>594</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cmdInsert</sender>
-   <signal>clicked()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>insertTuple()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>326</x>
-     <y>435</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>533</x>
-     <y>586</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>cmdOuterRight</sender>
    <signal>clicked()</signal>
diff --git a/relational_pyside/maingui.py b/relational_pyside/maingui.py
index 45429d7..c21e6ea 100644
--- a/relational_pyside/maingui.py
+++ b/relational_pyside/maingui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'relational_pyside/maingui.ui'
 #
-# Created: Sat Oct  8 20:14:44 2011
+# Created: Sun Oct  9 00:27:00 2011
 #      by: pyside-uic 0.2.13 running on PySide 1.0.7
 #
 # WARNING! All changes made in this file will be lost!
@@ -100,16 +100,6 @@ class Ui_MainWindow(object):
         self.verticalLayout_6.setSizeConstraint(QtGui.QLayout.SetMinimumSize)
         self.verticalLayout_6.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.cmdInsert = QtGui.QPushButton(self.layoutWidget1)
-        self.cmdInsert.setObjectName("cmdInsert")
-        self.horizontalLayout.addWidget(self.cmdInsert)
-        self.cmdDelete = QtGui.QPushButton(self.layoutWidget1)
-        self.cmdDelete.setObjectName("cmdDelete")
-        self.horizontalLayout.addWidget(self.cmdDelete)
-        self.verticalLayout_6.addLayout(self.horizontalLayout)
         self.lstHistory = QtGui.QListWidget(self.layoutWidget1)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -203,7 +193,7 @@ class Ui_MainWindow(object):
         self.verticalLayout_7.addLayout(self.horizontalLayout_2)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 20))
         self.menubar.setObjectName("menubar")
         self.menuFile = QtGui.QMenu(self.menubar)
         self.menuFile.setObjectName("menuFile")
@@ -253,8 +243,6 @@ class Ui_MainWindow(object):
         QtCore.QObject.connect(self.cmdOptimize, QtCore.SIGNAL("clicked()"), MainWindow.optimize)
         QtCore.QObject.connect(self.cmdUndoOptimize, QtCore.SIGNAL("clicked()"), MainWindow.undoOptimize)
         QtCore.QObject.connect(self.txtResult, QtCore.SIGNAL("returnPressed()"), self.txtQuery.setFocus)
-        QtCore.QObject.connect(self.cmdDelete, QtCore.SIGNAL("clicked()"), MainWindow.deleteTuple)
-        QtCore.QObject.connect(self.cmdInsert, QtCore.SIGNAL("clicked()"), MainWindow.insertTuple)
         QtCore.QObject.connect(self.cmdOuterRight, QtCore.SIGNAL("clicked()"), MainWindow.addORight)
         QtCore.QObject.connect(self.cmdOuter, QtCore.SIGNAL("clicked()"), MainWindow.addOuter)
         QtCore.QObject.connect(self.cmdOuterLeft, QtCore.SIGNAL("clicked()"), MainWindow.addOLeft)
@@ -287,9 +275,7 @@ class Ui_MainWindow(object):
         MainWindow.setTabOrder(self.cmdSelection, self.cmdRename)
         MainWindow.setTabOrder(self.cmdRename, self.cmdArrow)
         MainWindow.setTabOrder(self.cmdArrow, self.table)
-        MainWindow.setTabOrder(self.table, self.cmdInsert)
-        MainWindow.setTabOrder(self.cmdInsert, self.cmdDelete)
-        MainWindow.setTabOrder(self.cmdDelete, self.lstHistory)
+        MainWindow.setTabOrder(self.table, self.lstHistory)
         MainWindow.setTabOrder(self.lstHistory, self.cmdOptimize)
         MainWindow.setTabOrder(self.cmdOptimize, self.cmdUndoOptimize)
         MainWindow.setTabOrder(self.cmdUndoOptimize, self.cmdClearHistory)
@@ -322,8 +308,6 @@ class Ui_MainWindow(object):
         self.cmdSelection.setText(QtGui.QApplication.translate("MainWindow", "σ", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdRename.setText(QtGui.QApplication.translate("MainWindow", "ρ", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdArrow.setText(QtGui.QApplication.translate("MainWindow", "➡", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmdInsert.setText(QtGui.QApplication.translate("MainWindow", "Insert", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmdDelete.setText(QtGui.QApplication.translate("MainWindow", "Delete", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdOptimize.setText(QtGui.QApplication.translate("MainWindow", "Optimize", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdUndoOptimize.setText(QtGui.QApplication.translate("MainWindow", "Undo optimize", None, QtGui.QApplication.UnicodeUTF8))
         self.cmdClearHistory.setText(QtGui.QApplication.translate("MainWindow", "Clear history", None, QtGui.QApplication.UnicodeUTF8))