Merging landing page code

- Merging updates from NROER demo