Changed output fields to span elements