fix page and grid builder