Remove unnecessary code.
Make the command map layout nicer (two rows).