Add grid generator, upgrade grids templates
