Fixing the tooltip location problems