Rename edit state back to normal as it has vim keybindings.
Adjustments for switching between states.