Rearrange the command map for better spacing.