touch up layouts
Merge pull request #6 from thomashopkins/layout

touch up layouts