Improvement/refactor content images