More popup forward/next adjustments...
Merge pull request #118 from alaframboise/master

More popup forward/next adjustments...