UI mods and add edit iteration.
Merge branch 'master' of https://github.com/TEAM2-ISC567-FALL14/ISC567Fall2014.git