More module changes.

* Improved keybinding.