Updated the UI: wired up the 'avoid' checkbox.
Merged in orgin master