cancel in dialog does nothing like it should
Merge branch 'master' of https://github.com/AlvinYuan/cs160
changed progress layout