add controls, fix some styling issues
Merge branch 'master' into gh-pages
recompile