Merge branch 'changes/UI'