Fix conflicts

- Fix all conflicts between app and landing page.

- Update 'track' image

- Fix spacing on top slide