REFS: #252 few more ui changes