reworking markup for new design