Merge "UX feedback for ripple" into sc-dev