Some major restructuring of the UI (incomplete).