UI enhanced for the demo