Fixed leaking abstraction of the UI