GEP-73: ui improvement