Fixed UI for existing entities