reorder main menu items, and style changes