Better display on images. Close #43