After JIRA-84, we need to update the UI according the back-end changes. This is to implement the required change on the fronted in the Admin UI.