adjusting markup with new grid names