Merge "Update UX according to the new design"