fixture: UI refactor