A few more tweaks to mitigate editing URL everywhere, added demo link