Usage output improvements

• Prints sub-command shortcuts after the description
• Aligns options with and without a char shortcut