Added support for grid without form