Minor cleanup
Use wildcards to correctly map cursor movements handlers