Updated MainWindow