Update toolbar and fix bad html rendering
Merge branch 'develop' into gh-pages