Fixed MainWindow Class