Tweak the layout of the CLI spec