new UI for demo
after merge