[Duo2 Display] tweak and cleanup.