updated grid and other small details: