added fetching user image and some refactors