added demonstration ui test, fixed bugs