more UI fixes
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_alshahna
Merge pull request #55 from g2-aj/branch_alshahna

Branch alshahna