Add website entrance
Merge branch 'feature-website-entrance' into develop