Layout and CSS edits
Clean up CSS duplications
Merge pull request #31 from amy-mac/master

CSS fixes