UI enhancement for demo...