CLI layout improvements.