Badge & title cleanup