Better displaying of tooltip data and target site table