Add OU UI to entities
Minor cleanup