Make the "Add condition" dialog a bit more user friendly