remove .stacked-labels, improve .units, add .wrap