Merge pull request #59 from californiavol/master

merge from master
styling and layout updates
Merge pull request #60 from californiavol/macbook-branch

Macbook branch