Add tooltip and fix js
Add tooltip and fix js