Merge branch 'homepage-fix'