adding progresses
refactored modals