more restructuring to enable easier display mode switches