Improve loader + add goNextZone + handle next/last zone