Change HTML to suite the new CSS