Fixed menu issues.