Further enhancements to MainWindow and EditorWindow