Added image url and some other fixes