cleanup
Starting to allow editing in Subject Tab.