Fixed UI issues.
Merge branch 'master' of https://github.com/ahfergus1/cs3388