Revert "Refactor ActiveDisplay"

This reverts commit 31b3c19fde39ec13b0a110db832f027d4c6f8179.