getHeroAvatar improvements on all the pages \o/