Progress loading + Toast fix