Unit labels probably need to be coming from a message bundle?