clean up menu, update maps