More robust loading, and new loading icon