margin and spacing fixes
Merge branch 'master' into styling
Merge pull request #2 from zencephalon/styling

Styling