Tooltip display feature added.

Also made the code more readable by moving it to 2 different procedures.