Fix flickers on pulling an image
Cosmetic changes