Merge UI changes from Dev