layout changes
Merge pull request #2 from derwolfe/layout

layout changes