- Enhance UI for MCDemo