Fixed demo pages as per #119