added loading image
fixed merge conflicts