Improved demo
More tweaks to the demo