Some graphics reorg.