Adding images + refactorings