MainWindow: Improve view removal