Merge pull request #26 from kneekey23/twobirds-jw1

fix minor view errors2
css changes
css changes
Merge pull request #27 from kneekey23/nicole

Nicole
page 1 is all hooked up
Merge branch 'master' into twobirds-jw1