3A50c: Major UI change, pending a merge with master.