Tp/quality improvements part 2

The second bunch of clean-ups, related to the Display package.