Improve tooltip locations