Improve UI; bind 'enter' key in target dialog;