Massive cleanup
Honor user options
Add controls 'hide' mode
Merge branch 'master' into gh-pages