Merged UI changes