One more rearrangement
Waypoint prev/next, viewportWidth