Loader, progress indicators added