Refacto display

A set of little changes. You can see individual commits for an easier review.