Better positioning
Better highlight
Add remove animate