Optimized progress and added "x" in combo
Merge branch 'adding_files' into Version1.0