Move zoom control that no one ever uses
Merge branch 'master' into gh-pages