added good badges
fixed dashboard tracking