Made Menu.java more efficient