Updated menu scheme