Fix image and box drawing