Grid and pager fixes