Added landing page
Fix test
Concluding merge