Fixing html demo
Adding some additional styles and features
Fixing merge conflicts