Engine: UI: Lifecycle Environments: updates as part of PR review