Fixing Broken Menus (Resolved #201-5 and #201-6)