improved portal demo stuff to work on any demo