Add a wrapper and add back the name labels