Fixed double-selection bug in Edit Screen.  Cleaned up UI.