Added initial work for repositioning tooltip