Param ordering

Patches provided by @ctrueden for making the parameters in the CLI more closely match those in the UIs.

/cc @will-moore