Ref #3143 : Some last improvement to the display