working out layouts
Merge pull request #21 from belindahare/master

working out layouts