Merge pull request #50 from michellefish/master

fixed some layout and content issues