Reformat usage, beautify -m and change default displays