layout updates
Merge pull request #7 from seanderickson/layout_fixes

layout updates