Add main window and change exit move