GUI PoC Improvement #1