Dialog redesign for Feature Layer selection

Roll feature layer selection up in its own dialog.  Also fix buffer
selection around an incident.