Fixed label and badges issues