Updated Menu and modified