Update to readme
Update to toolbar buttons
Merge branch 'master' into gh-pages