Merge pull request #37 from amy-mac/master

STuff
Style and layout edits