Merged ui changes