Merge "Homepage UX revamp" into main