Draw images and refactor