fix legend color bug
fix tooltip position
Merged master fix conflict