Badge styling fixes