Fix spacing
Add div for positioning
Merge branch 'master' into gh-pages