removing dummy data and adding some loading stuff