Window|Refactor: Revised access to the main Window