badges view
Merge branch 'anisha-badges-3'
badge logic