Normalize display

Implemented normalization as discussed in #408. If the changes are accepted, we may close #405, #408.