Demo UI

Enhancement requests