fixes for selections and clearing

Preference selection was lost when a preference was moved or deleted in
the preference display.
Staging area and option selector are now properly cleared when DM
selection changes.
add Elmira conflict