(refs #488)Apply new UI to labels
(refs #488)Remove unnecessary div