Demo mode updates to try and make it easier to update the demo site