diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index ed90180..8b03e70 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -6,22 +6,12 @@
 
 #include <regex>
 
-#include <QItemSelectionModel>
-
 constexpr int STATUSBAR_TIMEOUT = 5000;
 
 MainWindow::MainWindow()
 {
     ui_.setupUi(this);
 
-    marketplace_ = std::make_unique<Marketplace>();
-    marketplace_->loadFromDb();
-    statusBar()->showMessage("Gespeicherte Daten wurden geladen.", STATUSBAR_TIMEOUT);
-
-    BasketModel* model = new BasketModel(getMarketplace(), ui_.basketView);
-    ui_.basketView->setModel(model);
-    ui_.basketView->setColumnHidden(0, true); // hide the uuid
-
     connect(ui_.actionQuit, &QAction::triggered, qApp, QApplication::quit);
     connect(ui_.actionEditSeller, &QAction::triggered, this,
             &MainWindow::on_actionEditSeller_triggered);
@@ -29,8 +19,13 @@ MainWindow::MainWindow()
             &MainWindow::on_sellerNoEdit_checkSellerNo);
     connect(ui_.paidButton, &QPushButton::clicked, this, &MainWindow::on_paidButton_triggered);
 
-    connect(ui_.basketView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
-            &MainWindow::onBasketViewSelectionChanged);
+    marketplace_ = std::make_unique<Marketplace>();
+    marketplace_->loadFromDb();
+    statusBar()->showMessage("Gespeicherte Daten wurden geladen.", STATUSBAR_TIMEOUT);
+
+    BasketModel* model = new BasketModel(getMarketplace(), ui_.basketView);
+    ui_.basketView->setModel(model);
+    ui_.basketView->setColumnHidden(0, true); // hide the uuid
 }
 
 void MainWindow::on_actionEditSeller_triggered()
@@ -90,14 +85,4 @@ void MainWindow::on_sellerNoEdit_checkSellerNo()
     }
 
     ui_.sellerNoEdit->clear();
-}
-
-void MainWindow::onBasketViewSelectionChanged(const QItemSelection& selected,
-                                                [[maybe_unused]] const QItemSelection& deselected)
-{
-    if (selected.size() > 0) {
-        ui_.cancelArticleButton->setEnabled(true);
-    } else {
-        ui_.cancelArticleButton->setEnabled(false);
-    }
 }
\ No newline at end of file
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 34e4334..598129c 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -17,10 +17,6 @@ class MainWindow : public QMainWindow
     MainWindow();
     Marketplace* getMarketplace() { return marketplace_.get(); }
 
-  private slots:
-    void onBasketViewSelectionChanged(const QItemSelection& selected,
-                                        const QItemSelection& deselected);
-
   private:
     void on_actionEditSeller_triggered();
     void on_sellerNoEdit_checkSellerNo();
diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 379b942..8e3c4c4 100644
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -194,7 +194,7 @@
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_5">
             <item>
-             <widget class="QPushButton" name="cancelArticleButton">
+             <widget class="QPushButton" name="pushButton_5">
               <property name="enabled">
                <bool>false</bool>
               </property>
@@ -204,9 +204,9 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="cancleAllArticlesButton">
+             <widget class="QPushButton" name="pushButton_4">
               <property name="enabled">
-               <bool>true</bool>
+               <bool>false</bool>
               </property>
               <property name="text">
                <string>Alles stornieren</string>
diff --git a/src/gui/sellerdialog.cpp b/src/gui/sellerdialog.cpp
index 63f2461..b2a284e 100644
--- a/src/gui/sellerdialog.cpp
+++ b/src/gui/sellerdialog.cpp
@@ -8,7 +8,6 @@
 SellerDialog::SellerDialog(QWidget* parent, Qt::WindowFlags f) : QDialog(parent, f)
 {
     ui_.setupUi(this);
-    ui_.editButton->setVisible(false);
     SellerModel* model =
         new SellerModel(dynamic_cast<MainWindow*>(parent)->getMarketplace(), ui_.tableView);
     ui_.tableView->setModel(model);
@@ -17,8 +16,6 @@ SellerDialog::SellerDialog(QWidget* parent, Qt::WindowFlags f) : QDialog(parent,
     connect(ui_.deleteButton, &QPushButton::clicked, this, &SellerDialog::on_deleteButton_clicked);
     connect(model, &SellerModel::duplicateSellerNo, this,
             &SellerDialog::on_model_duplicateSellerNo);
-    connect(ui_.tableView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
-            &SellerDialog::onSellerViewSelectionChanged);
 }
 
 void SellerDialog::on_newButton_clicked()
@@ -75,14 +72,4 @@ void SellerDialog::accept()
         }
     }
     QDialog::accept();
-}
-
-void SellerDialog::onSellerViewSelectionChanged(const QItemSelection& selected,
-                                                [[maybe_unused]] const QItemSelection& deselected)
-{
-    if (selected.size() > 0) {
-        ui_.deleteButton->setEnabled(true);
-    } else {
-        ui_.deleteButton->setEnabled(false);
-    }
 }
\ No newline at end of file
diff --git a/src/gui/sellerdialog.h b/src/gui/sellerdialog.h
index d48556b..4276630 100644
--- a/src/gui/sellerdialog.h
+++ b/src/gui/sellerdialog.h
@@ -15,10 +15,6 @@ class SellerDialog : public QDialog
     SellerDialog(QWidget* parent = nullptr,
                  Qt::WindowFlags f = Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
 
-  private slots:
-    void onSellerViewSelectionChanged(const QItemSelection& selected,
-                                      const QItemSelection& deselected);
-
   private:
     void on_newButton_clicked();
     void on_deleteButton_clicked();
diff --git a/src/gui/sellerdialog.ui b/src/gui/sellerdialog.ui
index 1938c47..7f5916e 100644
--- a/src/gui/sellerdialog.ui
+++ b/src/gui/sellerdialog.ui
@@ -65,9 +65,6 @@
        </item>
        <item>
         <widget class="QPushButton" name="deleteButton">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
          <property name="text">
           <string>Löschen</string>
          </property>