Fix button spacing
Recompile
Merge branch 'master' into gh-pages