some refactoring, updating build
moving loading logic to list view