Inspect UI refactoring