Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce