Refactored MainWindow fields