Demo images
Some refactoring