Merge with Jean and visual rework of share and favorite