menu udates and fixes