LB-1379 displayToggle function and cleanup