Improving add badge experience