Complete cleanup, added loading indicator and 404