Adding tooltip and shapes