Revise progressbar to gradation
Merge dev