Fix tooltips
Merge branch 'master' of github.com:openscholar/integrated_support