Added support for grid pages