Merged UI changes with system branch