More popup forward/next adjustments...