cosmetic improvements to loading app, minor refactoring