almost ready for demo

Replace pictures
Enhance move
Refactoring