Refactored MainWindow2 to MainWindow
Better handling of card removal