* Fixing demo pages