Refactoring
Added mask for shapes inside progress view
Refactoring