Modified Edit and Associate screens with  Roderick’s UI changes.