Simplification and remove hover on label and badges