Tried to remove pagination and refactor loading of data, issue #1