Resolve UI issues