Separated drawing the image & rendering it on screen

+ small fixe