Added additional Dialog as well as location selection boxes.