Updated with image preview