Minor layout tweak.
Externalizing labels.