Refactored map-adding in main menu - no more parallel arrays!