cli: drop --display from command-line help
cli: more flag cleanups, help layout improvements