merge in active display

Reviewed