Updated list of names
Fixed tooltips staying when button disabled
Merge branch 'master' into gh-pages