add new images and major refactoring