OOIION-1692

Wrap the labels in all panels (short text).  This prevents the values from clobbering w/ the labels.