-removed unnecessary loops and checks in Menu