Menu code changes completed