prettified a bit, added loading indicator