Rework some pages with new design