moving things around in general layout
Merge pull request #20 from ebmisdead/layout-rearrangement

moving things around in general layout