REFS: #253 UI Changes