Add loading indicator & improve network handling