Refactor achivement to badge