This change makes two components that were previously added 
to all pages, load when needed to reduce bundle size.

Changelog: performance