Resolve UI changes