Refactor Screen/Component management.