Badges improvements
epic