UI for demo
resolving merge