Improve token selection logic while editing text in the view

[mgod]

See #243 for initial improvements.

This should also address #401