Site: Updates based on feedback from `tangerine`