Modify gui code after logic refactor
Merge branch 'master' of github.com:cs2103aug2014-t09-4j/main