Fixed so it's easier to configure the menu and menubar