Merge new ui