Cleaned up cursor navigation
Renamed cursor set -> replace
Add/replace for cursors