updated grid and templates