Improve the demo page
Improve demo some more