improve GUI~
modified files
Merge branch 'master' of https://github.com/Cynthia1991/assignment2-v2
modified some GUI