Rename variable
Add missing import
Remove badge from widget when select badge in the badge picker