Fix and complete progress dialog changes