Merge "Change UI" into jb-mr2-dev