layout tweaks
Merge branch 'master' into layout
ready to deploy
Merge pull request #8 from bengolden/layout

ready to deploy