Updating layout to be a grid