layout updates
fixed merge
Merge pull request #41 from cmgerber/new-style

layout updates