New markup for new design