Work on newly refactored Image component