Merged work: minor UI changes