finalising landing page
fixed merge conflicts