Layout now uses separate map to find locos