Upgrade web

Closed 🚄 Job van der Voort 🚀 requested to merge upgrade-web into master