Updated movement of mouse
Updated highlighting logic