OP-984 UI changes.