Some minor refactorings
Fixed edit an invalid id
Merge branch 'master' of https://github.com/cs2103aug2014-t17-3j/main