style, added loading indicator, more changes