Added map to results page
Revert "Added map to results page"

This reverts commit a76d089cc536d76853dfbb3ccc227a7b91168b8f.
Merge branch 'master' into Eric
Added map view
Fixed results page bug to show back button again
Merge branch 'master' into Eric
Merge with Felix's link for logo