Last MainWindow improvements this night...