Move demo page to /Demo
Minor changes