Improved the selection handling
Completed the new cursor