Fixed Menu Issues