Reorder declaration of CL options
Add CL switch to display or not display legend