SWC-518: minor UI changes