Add conversion tracking and fix images