Add tooltip and popup