Simplified "Commands" command.

Also adds rank option, and removed hard-coded command categories.