Fixed Menu inconsistencies