Dialog & select2 improvements