Improve edit UI for subject.