fixed minor view errors
Merge branch 'master' into twobirds-jw1
Merge pull request #23 from kneekey23/nicole

Nicole
accept merge
Merge pull request #26 from kneekey23/twobirds-jw1

fix minor view errors2
css changes
css changes