Adjust markup of fields