Fix #585, Tooltip alignment

I think this is the proper fix for #585.