Replaced span with labels