Swap in the new grid and make the markup changes