Added back reporting built-in displays

and cleaned UI