Merge latest ui changes