Updated UI with additional options
Merge branch 'master' of https://github.com/dgillila/CPE448.git
Fixed problems so project will build