Issue #2: Improving GUI