various menu related code changes