Fixed image issue and few small changes

Fixed image issue and few small changes