cleanup and fancier demo UI