A bit of UI reorg.