Lots of updates, debugging and refactoring
Refactoring the demo page