Refining UI demo