Partial commit for Policy Editor UI
Partial commit for Policy Editor UI