WIP tooltip rework