Work on refactor/update of Image component