REFS: #253 UI changes