Merge branch 'daniel/landing-page'