diff --git a/CITATION.cff b/CITATION.cff
index da6bcc25c..4d9cda253 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -75,5 +75,5 @@ keywords:
   - Software Impact
   - Software Reuse
 license: Apache-2.0
-version: v1.11.0
-date-released: '2022-11-15'
+version: v1.11.1
+date-released: '2022-11-18'
diff --git a/database/100-create-api-views.sql b/database/100-create-api-views.sql
index 7a6537c62..80f872352 100644
--- a/database/100-create-api-views.sql
+++ b/database/100-create-api-views.sql
@@ -1171,7 +1171,13 @@ $$
 BEGIN
 	SELECT count(id) FROM software INTO software_cnt;
 	SELECT count(id) FROM project INTO project_cnt;
-	SELECT count(id) FROM organisation WHERE parent IS NULL INTO organisation_cnt;
+	SELECT
+		count(id) AS organisation_cnt
+	FROM
+		organisations_overview(true)
+	WHERE
+		organisations_overview.parent IS NULL AND organisations_overview.score>0
+	INTO organisation_cnt;
 	SELECT count(display_name) FROM unique_contributors() INTO contributor_cnt;
 	SELECT count(mention) FROM mention_for_software INTO software_mention_cnt;
 END
diff --git a/frontend/components/AppFooter/ContactEmail.tsx b/frontend/components/AppFooter/ContactEmail.tsx
index b6e0b0cb4..1138f51b6 100644
--- a/frontend/components/AppFooter/ContactEmail.tsx
+++ b/frontend/components/AppFooter/ContactEmail.tsx
@@ -8,12 +8,12 @@ import Mail from '@mui/icons-material/Mail'
 export default function ContactEmail({email}:{email?:string}) {
   if (email) {
     return (
-      <div>
-        <div className="mt-4 text-lg">Questions or comments?</div>
+      <div className="mt-8">
+        {/* <div className="mt-4 text-lg">Questions or comments?</div> */}
         <a href={`mailto:${email}`}
-            className="flex mt-2 text-primary hover:text-primary-content"
+          className="flex text-primary hover:text-primary-content"
         >
-        <Mail className="mr-2"/> {email}
+          <Mail className="mr-2"/> {email}
         </a>
       </div>
     )
diff --git a/frontend/components/AppFooter/index.tsx b/frontend/components/AppFooter/index.tsx
index b11758a12..7925c3b9f 100644
--- a/frontend/components/AppFooter/index.tsx
+++ b/frontend/components/AppFooter/index.tsx
@@ -21,8 +21,7 @@ export default function AppFooter () {
       <div className="grid grid-cols-1 gap-8 px-4 md:grid-cols-[2fr,1fr] lg:container lg:mx-auto">
         <div className="pt-8 md:py-8">
           <p className="text-lg">
-            The Research Software Directory aims to promote the impact,
-            the exchange and re-use of research software.
+            The Research Software Directory promotes the impact, re-use and citation of research software.
           </p>
 
           <ContactEmail email={host?.email} />
diff --git a/frontend/components/GlobalSearchAutocomplete/index.tsx b/frontend/components/GlobalSearchAutocomplete/index.tsx
index d94e41c9b..c663114d8 100644
--- a/frontend/components/GlobalSearchAutocomplete/index.tsx
+++ b/frontend/components/GlobalSearchAutocomplete/index.tsx
@@ -128,7 +128,7 @@ export default function GlobalSearchAutocomplete(props: Props) {
       setOpen(false)
     }}>
       <div
-        className={`${props.className} relative z-10 flex w-full xl:w-52 xl:max-w-[320px] focus-within:w-full duration-700`}>
+        className={`${props.className} relative z-10 flex w-full xl:w-[14.5rem] xl:max-w-[20rem] focus-within:w-full duration-700`}>
         <div className="absolute top-[14px] left-3 pointer-events-none">
           {/* Search Icon */}
           <svg width="16" height="16" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -138,7 +138,7 @@ export default function GlobalSearchAutocomplete(props: Props) {
           </svg>
         </div>
         <input className="px-2 pl-8 py-2 bg-transparent rounded-sm border border-white border-opacity-50 focus:outline-0 w-full focus:bg-white focus:text-black duration-200"
-          placeholder="Search or jump to..."
+          placeholder="Search in RSD or jump to..."
           autoComplete="off"
           value={inputValue}
           onChange={handleChange}
diff --git a/frontend/components/home/rsd/OrganisationSignUp.tsx b/frontend/components/home/rsd/OrganisationSignUp.tsx
new file mode 100644
index 000000000..459287c4f
--- /dev/null
+++ b/frontend/components/home/rsd/OrganisationSignUp.tsx
@@ -0,0 +1,164 @@
+// SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+// SPDX-FileCopyrightText: 2022 dv4all
+//
+// SPDX-License-Identifier: Apache-2.0
+
+import {useState} from 'react'
+import useTheme from '@mui/material/styles/useTheme'
+import useMediaQuery from '@mui/material/useMediaQuery'
+import Dialog from '@mui/material/Dialog'
+import MailOutlineOutlined from '@mui/icons-material/MailOutlineOutlined'
+
+import {config,organisationSignUp} from './config'
+import useRsdSettings from '~/config/useRsdSettings'
+import {useForm} from 'react-hook-form'
+
+type SignUpOrganisation = {
+  name: string,
+  organisation: string,
+  role: string,
+  description: string
+}
+
+const inputClasses='mb-4 placeholder:text-gray-500 outline-0 p-2 w-full text-sm bg-transparent text-white border border-gray-600 rounded-sm'
+
+export default function OrganisationSignUp({minWidth = '9rem'}:{minWidth:string}) {
+  const theme = useTheme()
+  const fullScreen = useMediaQuery(theme.breakpoints.down('sm'))
+  const {host} = useRsdSettings()
+  const [open, setOpen] = useState(false)
+
+  const {register, watch, reset} = useForm<SignUpOrganisation>({
+    mode: 'onChange',
+    defaultValues: {
+      name:'',
+      organisation: '',
+      role:'',
+      description: ''
+    }
+  })
+
+  const [name,organisation,role,description] = watch(['name','organisation','role','description'])
+
+  // console.group('Organisation Sing Up')
+  // console.log('name...', name)
+  // console.log('organisation...', organisation)
+  // console.log('description...', description)
+  // console.groupEnd()
+
+  function mailBody(): string | undefined {
+    return encodeURIComponent(`Hi RSD team,
+
+    I would like to add my organisation to RSD!
+
+    -------------------------
+    Name: ${name}
+    Organisation: ${organisation}
+    Professional role: ${role}
+    -------------------------
+
+    ${description}
+  `)
+  }
+
+  function closeAndReset() {
+    setOpen(false)
+    // reset form after all processes settled
+    // we need to wait for mailBody function
+    setTimeout(() => {
+      reset()
+    },0)
+  }
+
+  return (
+    <>
+      <button
+        aria-describedby="Sign up button"
+        onClick={()=>setOpen(true)}
+      >
+        <div className="relative group">
+          <div
+            className="absolute -inset-1 bg-gradient-to-r from-purple-600 to-pink-600 rounded-lg blur opacity-25 group-hover:opacity-100 transition duration-1000 group-hover:duration-300"/>
+          <div
+            className="flex gap-3 text-black relative px-8 py-3 bg-white ring-1 ring-gray-900/5 rounded leading-none items-center justify-center space-x-2"
+            style={{
+              minWidth
+            }}
+          >
+            <span className="space-y-2 text-xl font-medium whitespace-nowrap">
+              {config.button.register.label}
+            </span>
+          </div>
+        </div>
+      </button>
+      <Dialog
+        fullScreen={fullScreen}
+        open={open}
+        onClose={()=>setOpen(false)}
+        aria-labelledby="responsive-dialog-title"
+      >
+        <div className="h-full w-full bg-[#232323] p-6">
+          <div className="mx-auto">
+            <div className="text-white text-xl mb-4">
+              {config.button.register.label}
+            </div>
+            <div className="text-sm text-[#B7B7B7] pb-4">
+              You can find more information about registering your organisation in our <u><a href="https://research-software-directory.github.io/documentation/register-organization.html" target="_blank" rel="noreferrer">documentation</a></u>.
+            </div>
+            {/* INPUTS */}
+            <input type="text"
+              autoFocus={true}
+              autoComplete="off"
+              className={inputClasses}
+              placeholder={organisationSignUp.name.label}
+              {...register('name')}
+            />
+            <input type="text"
+              autoComplete="off"
+              className={inputClasses}
+              placeholder={organisationSignUp.organisation.label}
+              {...register('organisation')}
+            />
+            <input type="text"
+              autoComplete="off"
+              className={inputClasses}
+              placeholder={organisationSignUp.role.label}
+              {...register('role')}
+            />
+            <textarea
+              rows={5}
+              className={inputClasses}
+              placeholder={organisationSignUp.description.label}
+              {...register('description')}
+            >
+            </textarea>
+            {/* NOTIFICATIONS */}
+            <div className="text-sm text-[#B7B7B7] pb-4">
+              {organisationSignUp.notification[0]} <br/>
+              {organisationSignUp.notification[1]}
+            </div>
+            {/* NAVIGATION */}
+            <div className="flex justify-end items-center gap-4 my-2">
+              <button
+                className="text-sm text-white border border-gray-500 text-opacity-60 rounded px-4 py-1 hover:opacity-90 active:opacity-95"
+                onClick={closeAndReset}>
+                Cancel
+              </button>
+              <a
+                role="button"
+                type="submit"
+                onClick={closeAndReset}
+                className="text-sm text-white hover:text-white bg-primary px-4 py-1 rounded hover:opacity-90 active:opacity-95"
+                target="_blank"
+                rel="noreferrer"
+                href={`mailto:${host.email}?subject=${encodeURIComponent(config.button.register.label)}&body=${mailBody()}`}
+              >
+                <MailOutlineOutlined/> Create email *
+              </a>
+            </div>
+          </div>
+        </div>
+      </Dialog>
+    </>
+  )
+}
diff --git a/frontend/components/home/rsd/PersonalSignUp.tsx b/frontend/components/home/rsd/PersonalSignUp.tsx
new file mode 100644
index 000000000..eba734717
--- /dev/null
+++ b/frontend/components/home/rsd/PersonalSignUp.tsx
@@ -0,0 +1,177 @@
+// SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+// SPDX-FileCopyrightText: 2022 dv4all
+//
+// SPDX-License-Identifier: Apache-2.0
+
+import {useState} from 'react'
+import useTheme from '@mui/material/styles/useTheme'
+import useMediaQuery from '@mui/material/useMediaQuery'
+import Dialog from '@mui/material/Dialog'
+import MailOutlineOutlined from '@mui/icons-material/MailOutlineOutlined'
+
+import {config,personalSignUp} from './config'
+import useRsdSettings from '~/config/useRsdSettings'
+import {useForm} from 'react-hook-form'
+
+type SignUpForm = {
+  name: string,
+  affiliation: string,
+  role: string,
+  orcid: string,
+  description:string
+}
+
+const inputClasses='mb-4 placeholder:text-gray-500 outline-0 p-2 w-full text-sm bg-transparent text-white border border-gray-600 rounded-sm'
+
+export default function PersonalSignUp({minWidth = '9rem'}:{minWidth:string}) {
+  const theme = useTheme()
+  const fullScreen = useMediaQuery(theme.breakpoints.down('sm'))
+  const {host} = useRsdSettings()
+  const [open, setOpen] = useState(false)
+
+  const {register, watch, reset} = useForm<SignUpForm>({
+    mode: 'onChange',
+    defaultValues: {
+      name:'',
+      affiliation: '',
+      role:'',
+      orcid: '',
+      description: ''
+    }
+  })
+
+  const [name,affiliation,role,orcid,description] = watch(['name','affiliation','role','orcid','description'])
+
+  // console.group('Personal Sing Up')
+  // console.log('name...', name)
+  // console.log('affiliation...', affiliation)
+  // console.log('orcid...', orcid)
+  // console.log('description...', description)
+  // console.groupEnd()
+
+  function mailBody(): string | undefined {
+    return encodeURIComponent(`Hi RSD team,
+
+    I would like to join RSD!
+
+    -------------------------
+    Name: ${name}
+    Affiliation: ${affiliation}
+    Professional role: ${role}
+    ORCID: ${orcid}
+    -------------------------
+
+    ${description}
+  `)
+  }
+
+  function closeAndReset() {
+    setOpen(false)
+    // reset form after all processes settled
+    // we need to wait for mailBody function
+    setTimeout(() => {
+      reset()
+    },0)
+  }
+
+  return (
+    <>
+      <button
+        aria-describedby="Sign up button"
+        onClick={()=>setOpen(true)}
+      >
+        <div className="relative group">
+          <div
+            className="absolute -inset-1 bg-gradient-to-r from-purple-600 to-pink-600 rounded-lg blur opacity-25 group-hover:opacity-100 transition duration-1000 group-hover:duration-300"/>
+          <div
+            className="flex gap-3 text-black relative px-8 py-3 bg-white ring-1 ring-gray-900/5 rounded leading-none items-center justify-center space-x-2"
+            style={{
+              minWidth
+            }}
+          >
+            <span className="space-y-2 text-xl font-medium whitespace-nowrap">
+              {config.button.signUp.label}
+            </span>
+          </div>
+        </div>
+      </button>
+      <Dialog
+        fullScreen={fullScreen}
+        open={open}
+        onClose={()=>setOpen(false)}
+        aria-labelledby="responsive-dialog-title"
+      >
+        <div className="h-full w-full bg-[#232323] p-6">
+          <div className="mx-auto">
+            <div className="text-white text-xl mb-4">
+              {config.button.signUp.label}
+            </div>
+            <div className="text-sm text-[#B7B7B7] pb-4">
+              You can find more information about how to get access in our <u><a href="https://research-software-directory.github.io/documentation/getting-access.html" target="_blank" rel="noreferrer">documentation</a></u>.
+            </div>
+            {/* INPUTS */}
+            <input type="text"
+              autoFocus={true}
+              autoComplete="off"
+              className={inputClasses}
+              placeholder={personalSignUp.name.label}
+              {...register('name')}
+            />
+            <input type="text"
+              autoComplete="off"
+              className={inputClasses}
+              placeholder={personalSignUp.affiliation.label}
+              {...register('affiliation')}
+            />
+            <input type="text"
+              autoComplete="off"
+              className={inputClasses}
+              placeholder={personalSignUp.role.label}
+              {...register('role')}
+            />
+            <input type="text"
+              autoComplete="off"
+              className={inputClasses}
+              placeholder={personalSignUp.orcid.label}
+              {...register('orcid')}
+            />
+            <textarea
+              rows={5}
+              className={inputClasses}
+              placeholder={personalSignUp.description.label}
+              {...register('description')}
+            >
+            </textarea>
+            <div className="text-sm text-[#B7B7B7]">
+
+            </div>
+            {/* NOTIFICATIONS */}
+            <div className="text-sm text-[#B7B7B7] pb-4">
+              {personalSignUp.notification[0]} <br/>
+              {personalSignUp.notification[1]}
+            </div>
+            {/* NAVIGATION */}
+            <div className="flex justify-end items-center gap-4 my-2">
+              <button
+                className="text-sm text-white border border-gray-500 text-opacity-60 rounded px-4 py-1 hover:opacity-90 active:opacity-95"
+                onClick={closeAndReset}>
+                Cancel
+              </button>
+              <a
+                role="button"
+                type="submit"
+                onClick={closeAndReset}
+                className="text-sm text-white hover:text-white bg-primary px-4 py-1 rounded hover:opacity-90 active:opacity-95"
+                target="_blank"
+                rel="noreferrer"
+                href={`mailto:${host.email}?subject=${encodeURIComponent(config.button.signUp.label)}&body=${mailBody()}`}
+              >
+                <MailOutlineOutlined/> Create email *
+              </a>
+            </div>
+          </div>
+        </div>
+      </Dialog>
+    </>
+  )
+}
diff --git a/frontend/components/home/rsd/config.ts b/frontend/components/home/rsd/config.ts
index 640f1d1c7..3b5fe1008 100644
--- a/frontend/components/home/rsd/config.ts
+++ b/frontend/components/home/rsd/config.ts
@@ -12,13 +12,15 @@ export const config = {
     },
     signUp: {
       label: 'Sign up to contribute',
-      url: 'https://research-software-directory.github.io/documentation/getting-access.html',
-      target: '_blank'
+      // MOVED to form
+      // url: 'https://research-software-directory.github.io/documentation/getting-access.html',
+      // target: '_blank'
     },
     register: {
-      label: 'Register your organization',
-      url: 'mailto:rsd@esciencecenter.nl?subject=Register organisation',
-      target: '_blank'
+      label: 'Register your organisation',
+      // MOVED to form
+      // url: 'mailto:rsd@esciencecenter.nl?subject=Register organisation',
+      // target: '_blank'
     },
     demo: {
       label: 'Demo',
@@ -52,3 +54,47 @@ export const config = {
     },
   }
 }
+
+export const personalSignUp = {
+  notification: [
+    '* Required',
+    'We will use your default email application to send an email to rsd@esciencecenter.nl. Please send us an email directly if this fails.'
+  ],
+  name: {
+    label: 'Your name *'
+  },
+  affiliation: {
+    label: 'Your affiliation *'
+  },
+  role: {
+    label: 'Your professional role'
+  },
+  orcid: {
+    label: 'Your ORCID'
+  },
+  description: {
+    label: 'Any additional information you would like to share about your request, such as a description of the content you would like to contribute.',
+  }
+}
+
+export const organisationSignUp = {
+  notification: [
+    '* Required',
+    'We will use your default email application to send an email to rsd@esciencecenter.nl. Please send us an email directly if this fails.'
+  ],
+  name: {
+    label: 'Name *'
+  },
+  organisation: {
+    label: 'Organisation *'
+  },
+  role: {
+    label: 'Professional role'
+  },
+  // rorId: {
+  //   label: 'ROR id'
+  // },
+  description: {
+    label: 'Any additional information you would like to share about your request such as a link to the website of your organisation.',
+  }
+}
diff --git a/frontend/components/home/rsd/index.tsx b/frontend/components/home/rsd/index.tsx
index f165ef369..150e36871 100644
--- a/frontend/components/home/rsd/index.tsx
+++ b/frontend/components/home/rsd/index.tsx
@@ -24,6 +24,8 @@ import LogoUMC from '~/assets/logos/LogoUMC.svg'
 import LogoUU from '~/assets/logos/LogoUU.svg'
 import LogoLeiden from '~/assets/logos/LogoLeiden.svg'
 import Arc from './arc.svg'
+import PersonalSignUp from './PersonalSignUp'
+import OrganisationSignUp from './OrganisationSignUp'
 
 /*! purgecss start ignore */
 import 'aos/dist/aos.css'
@@ -76,44 +78,40 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
       <AppHeader/>
 
       {/* Jumbo Banner  */}
-      <div className="mx-auto my-20 relative overflow-x-clip ">
-
-        {/* Jumbo Image*/}
-        <div
-          className="pointer-events-none absolute w-full h-full -top-[170px] md:-top-48 -left-[60px] md:left-[50%] opacity-50 md:opacity-100">
-          <Image src="/images/illustration.webp" width="847" height="760" alt="rsd-illustration"/>
-        </div>
-
-        <div className="w-full p-5 md:p-10 max-w-screen-xl mx-auto">
-          {/* Jumbo Text*/}
-          <div className="w-full md:w-1/2 flex flex-col justify-center"
-               data-aos="fade" data-aos-offset="200" data-aos-delay="50" data-aos-duration="1000"
-          >
-            <h1 className="text-5xl font-rsd-titles font-bold">
-              Showing the impact <br/>
-              of research software
-            </h1>
-            <div className="mt-8 text-lg">
-              The<span
-              className="text-transparent font-medium bg-clip-text bg-gradient-to-tr from-[#03A9F1] to-[#09FBD3] px-1">
-                  Research Software Directory
-                </span>
-              is designed to show the impact research software has on research and society. We
-              stimulate the reuse of research software and encourage proper citation of research
-              software to ensure researchers and RSEs get credit for their work. {/*Learn more.*/}
-            </div>
-
-            {/* <div className="flex gap-4 md:gap-10 mt-10 items-center">
-              <GlowingButton text={button.discover.label} url={button.discover.url} target={button.discover.target} />
-            </div> */}
+      <div className="max-w-screen-xl mx-auto p-5 md:p-10 grid lg:grid-cols-[1fr,1fr] gap-[2rem]">
+        {/* Jumbo Text*/}
+        <div className="flex flex-col justify-center"
+              data-aos="fade" data-aos-offset="200" data-aos-delay="50" data-aos-duration="1000"
+        >
+          <h1 className="text-5xl font-rsd-titles font-bold">
+            Show your research software to the world
+          </h1>
+          <div className="mt-8 text-lg">
+            The<span
+            className="text-transparent font-medium bg-clip-text bg-gradient-to-tr from-[#03A9F1] to-[#09FBD3] px-1">
+                Research Software Directory
+              </span>
+            is designed to show the impact research software has on research and society. We
+            stimulate the reuse of research software and encourage proper citation of research
+            software to ensure researchers and RSEs get credit for their work. {/*Learn more.*/}
           </div>
         </div>
+        {/* Jumbo image */}
+        <div className="relative">
+          <Image
+            src="/images/screenshots.webp"
+            width="877"
+            height="767"
+            layout="intrinsic"
+            alt="rsd-illustration"
+          />
+        </div>
       </div>
 
       {/*  Divider  */}
       {/* <LandingPageDivider/> */}
 
-      {/* stats  */}
+      {/* Stats  */}
       <div className="max-w-screen-xl mx-auto flex flex-wrap justify-between gap-10 md:gap-16 p-5 md:p-10 ">
         <div>
           <div className="text-lg">{software_cnt} Software</div>
@@ -145,75 +143,10 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
         {/* Arc separator  */}
         <Arc className="w-full text-white dark:text-black -translate-y-1"></Arc>
 
-
-        {/* Feature Cards  - Saved for later */}
-        {/*<div
-          className="w-full max-w-screen-xl mt-6 mx-auto flex-col grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3  gap-3 p-2 ">
-          <div className=""
-               data-aos="fade-up" data-aos-duration="400"
-               data-aos-easing="ease-in-out"
-          >
-            <div className={`${styles.card} h-full`}>
-              <div className={styles.cardInside}
-                   style={{backgroundImage: 'url("/images/bg_card.svg")'}}>
-                <div className="flex flex-col justify-center">
-                  <div className="text-3xl font-medium">
-                    Discover
-                  </div>
-                  <div className="text-lg mt-5">
-                    Find
-
-                    <span
-                      className="text-transparent bg-clip-text bg-gradient-to-tr from-blue-500 to-green-400 px-1">
-                  research software
-                </span>
-                    that is relevant to your research
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div data-aos="fade-up" data-aos-delay="50" data-aos-duration="400"
-               data-aos-easing="ease-in-out">
-            <div className={`${styles.card} h-full`}>
-              <div className={styles.cardInside}
-                   style={{backgroundImage: 'url("/images/bg_card.svg")'}}>
-                <div className="flex flex-col justify-center" style={{}}
-                >
-                  <div className="text-3xl font-medium">
-                    Share
-                  </div>
-                  <div className="text-lg mt-5">
-                    Showcase your research software and promote reuse by others.
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className=""
-               data-aos="fade-up" data-aos-delay="100" data-aos-duration="400"
-               data-aos-easing="ease-in-out">
-            <div className={`${styles.card} h-full`}>
-              <div className={styles.cardInside}
-                   style={{backgroundImage: 'url("/images/bg_card.svg")'}}>
-                <div className="flex flex-col justify-center">
-                  <div className="text-3xl font-medium">
-                    Impact
-                  </div>
-                  <div className="text-lg mt-5">
-                    Enable developers and research organizations to monitor the impact of their
-                    research software.
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>*/}
-
-
         {/* Get started section  */}
-        <section className="px-5 md:px-10 py-5 ">
+        <section
+          id="get-started"
+          className="px-5 md:px-10 py-5 ">
           <h2 className="flex justify-center text-4xl font-rsd-titles font-bold"
               data-aos="fade" data-aos-duration="400" data-aos-easing="ease-in-out">
             {/* eslint-disable-next-line react/no-unescaped-entities */}
@@ -240,21 +173,17 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
               data-aos-duration="300"
               data-aos-easing="ease-in-out"
             >
-              <GlowingButton
-                text={button.signUp.label}
-                url={button.signUp.url}
-                target={button.signUp.target}
-                minWidth='19rem' />
+              <PersonalSignUp
+                minWidth='19rem'
+              />
             </div>
             <div className="flex justify-center" data-aos="fade-up" data-aos-delay="200"
               data-aos-duration="300"
               data-aos-easing="ease-in-out"
             >
-              <GlowingButton
-                text={button.register.label}
-                url={button.register.url}
-                target={button.register.target}
-                minWidth='19rem' />
+              <OrganisationSignUp
+                minWidth='19rem'
+              />
             </div>
           </div>
         </section>
@@ -263,9 +192,11 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
         <LandingPageDivider/>
 
         {/* Our Goals Section */}
-        <section className="p-5 md:p-10 w-full max-w-screen-xl mx-auto">
+        <section
+          id="our-goals"
+          className="p-5 md:p-10 w-full max-w-screen-xl mx-auto">
           <h2
-            className="flex justify-start text-3xl font-rsd-titles font-bold mt-6"
+            className="flex justify-start text-4xl font-rsd-titles font-bold mt-6"
             data-aos="fade" data-aos-duration="400" data-aos-easing="ease-in-out">
             Our goals
           </h2>
@@ -320,6 +251,7 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
 
         {/* Learn more section  */}
         <section
+          id="learn-more"
           className="p-5 md:p-10 grid gap-12 grid-cols-1 sm:grid-cols-2 max-w-screen-xl mt-20 mx-auto">
           <div className="relative">
             <Image
@@ -338,7 +270,7 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
             <p className="text-center text-lg mt-5" data-aos="fade"
                data-aos-delay="100" data-aos-duration="400" data-aos-easing="ease-in-out">
               Try out our online demo, or get more detailed information in our documentation and
-              faq.
+              FAQ.
             </p>
 
             <div
@@ -378,7 +310,9 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
 
 
         {/* About us section  */}
-        <section className="px-5 md:px-10 py-5 w-full max-w-screen-lg mx-auto mt-10">
+        <section
+          id="about-us"
+          className="px-5 md:px-10 py-5 w-full max-w-screen-lg mx-auto mt-10">
           <h2 className="flex justify-center text-4xl font-rsd-titles font-bold "
               data-aos="fade" data-aos-duration="400" data-aos-easing="ease-in-out">
             {/* eslint-disable-next-line react/no-unescaped-entities */}
@@ -387,7 +321,7 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
           <p className="text-center text-lg mt-5" data-aos="fade"
              data-aos-delay="100" data-aos-duration="400" data-aos-easing="ease-in-out">
             The Research Software Directory is an open source project initiated by the Netherlands
-            eScience Center. We are always open for improvements and discussions. Feel free to
+            eScience Center and jointly developed with Helmholtz. Feel free to
             contact us or join our effort!
           </p>
 
@@ -427,7 +361,9 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
         <LandingPageDivider/>
 
         {/* Logos  */}
-        <div className="w-full max-w-screen-xl mx-auto mt-10 p-5 md:p-10">
+        <div
+          id="partners"
+          className="w-full max-w-screen-xl mx-auto mt-10 p-5 md:p-10">
           <div id="whyrsd" className="text-xl opacity-50">
             Partners using the Research Software Directory
           </div>
diff --git a/frontend/public/data/settings.json b/frontend/public/data/settings.json
index 8ef251b04..887b99846 100644
--- a/frontend/public/data/settings.json
+++ b/frontend/public/data/settings.json
@@ -18,7 +18,7 @@
       "target": "_self"
     },
     {
-      "label": "Documentation",
+      "label": "User Documentation",
       "url": "https://research-software-directory.github.io/documentation",
       "target": "_blank"
     },
diff --git a/frontend/public/images/screenshots.webp b/frontend/public/images/screenshots.webp
new file mode 100644
index 000000000..2f26b213e
Binary files /dev/null and b/frontend/public/images/screenshots.webp differ
diff --git a/frontend/public/images/screenshots.webp.license b/frontend/public/images/screenshots.webp.license
new file mode 100644
index 000000000..49b108bbb
--- /dev/null
+++ b/frontend/public/images/screenshots.webp.license
@@ -0,0 +1,6 @@
+SPDX-FileCopyrightText: 2022 Jesús García Gonzalez (Netherlands eScience Center) <j.g.gonzalez@esciencecenter.nl>
+SPDX-FileCopyrightText: 2022 Netherlands eScience Center
+SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2022 dv4all
+
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/frontend/utils/getOrganisations.ts b/frontend/utils/getOrganisations.ts
index ddc80b609..166b34437 100644
--- a/frontend/utils/getOrganisations.ts
+++ b/frontend/utils/getOrganisations.ts
@@ -16,7 +16,7 @@ import {paginationUrlParams} from './postgrestUrl'
 export function organisationListUrl({search, rows = 12, page = 0}:
   { search: string | undefined, rows: number, page: number }) {
   // by default order is on software count and name
-  let url = `${process.env.POSTGREST_URL}/rpc/organisations_overview?parent=is.null&order=score.desc.nullslast,name.asc`
+  let url = `${process.env.POSTGREST_URL}/rpc/organisations_overview?parent=is.null&score=gt.0&order=is_tenant.desc,score.desc.nullslast,name.asc`
   // add search params
   if (search) {
     url += `&or=(name.ilike.*${search}*, website.ilike.*${search}*)`