Big tidy of Main Window in accordance with new Core Application class