More Fixes
Quick hack to cover up tooltip issues; could maybe apply this to everything else in the tooltip selections to cover future button-naming problems.
Merge remote-tracking branch 'upstream/master'