Add new mapping.
Rearrange shortcut.
Minor fix.