Initial pass at the discovery-page
Rebase fixes