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

layout changes
Merge pull request #68 from californiavol/imac-work

Imac work
Merge pull request #70 from californiavol/master

merge from master