TBD-1058: Review the labels display layout