Modified text for main landing page
Fixed merge changes