Move menu loop into Menu class