Fixed Menu issues