improving badges and adding progress-bar