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

Updates based on PR feedback as well as other random cleanup.