edited layout to use grid