Added support for grid page