#240 Completed fallback logic for step image and refactored it