new buttons; add loading notification
Merge branch 'master' into gh-pages