Active Display rework (1/2)