One more tweak on next/prev page buttons