layout changes
Merge pull request #67 from californiavol/macbook-branch

layout changes