Consistent layout of each command's options

grouped all single letter options together and long options together