[#1251] Tweaks to pagination controls on grid view