layout updates
Merge pull request #4 from cameronreed/cr-branch

layout updates