Added loading indicators and did some refactoring/moving around