Fix moving the cursor and Add the ability to select modes