New markup and style