Small changes to Menu handling