diff --git a/docs/apis/api.md b/docs/apis/api.md
index 1d1e4e30fd1bb0e9f0e2d71f86ab11b5f1e65ea4..1d57adcafe62000dc36790c13d7d75fce4b5487e 100644
--- a/docs/apis/api.md
+++ b/docs/apis/api.md
@@ -250,7 +250,7 @@ the API:
 - Raw files, the files as they were uploaded to NOMAD.
 - Archive data, all of the extracted data for an entry.
 
-There are also different entities (see also [Datamodel](../learn/basics.md)) with different functions in the API:
+There are also different entities (see also [Datamodel](../explanation/basics.md)) with different functions in the API:
 
 - Entries
 - Uploads
diff --git a/docs/data/upload.md b/docs/data/upload.md
index f2c4dcf23d8a60d4c80373d6b677b20172a0912d..b97773c0fa0d565990bda80647e2537c713b4c5d 100644
--- a/docs/data/upload.md
+++ b/docs/data/upload.md
@@ -10,11 +10,14 @@ NOMAD will simply extract them and consider the whole directory structure within
 
 ## Create an upload and add files
 
-Open [NOMAD](https://nomad-lab.eu/prod/v1) and log in (you need to create an account first).
+Open [NOMAD](https://nomad-lab.eu/prod/v1) and log in; if you don't have a NOMAD account, please create one.
 
 Go to `PUBLISH` / `Uploads`. Here you can create an upload with the `CREATE A NEW UPLOAD`
 button. This will bring you to the upload page.
 
+Before you start, make sure that the size of your data does not exceed the [upload limits](#upload-limits). If it does, please contact us.
+
+
 You can drop your files on (or click) the `CLICK OR DROP FILES` button. On top you will
 see a list of supported file formats and details on the files to upload.
 You can also go to the `FILES` tab. Here you can create directories and drop files into directories.
@@ -22,16 +25,16 @@ You can also go to the `FILES` tab. Here you can create directories and drop fil
 ## Processing files
 
 NOMAD interprets your files. It checks each file and recognizes the main output file of the
-supported codes. NOMAD creates an entry for this *mainfile* that represents the respective
+supported codes. NOMAD creates an entry for this **mainfile** that represents the respective
 data of this code run, experiment, etc.
 
-While you can browse all files of an upload from its *upload page*, NOMAD only
-allows to search for such recognized *mainfiles*. As long as your upload does not contain any
+While you can browse all files of an upload from its **upload page**, NOMAD only
+allows to search for such recognized **mainfiles**. As long as your upload does not contain any
 files that are recognized by NOMAD, you cannot publish the data.
 
 However, all files that are associated to a recognized *mainfile* by being in the
-same directory are displayed as *auxiliary* files next to the entry represented
-by the *mainfile*.
+same directory are displayed as **auxiliary** files next to the entry represented
+by the **mainfile**.
 
 
 
@@ -120,7 +123,7 @@ If you provide data for a potentially large amount of entries, it might be advis
 to provide *user metadata* via file. See [user metadata](#user-metadata) above for details.
 
 To further automate, you can also upload and directly publish data. After performing some
-smaller test uploads, you should consider to skip our staging and publish the upload
+smaller test uploads, you should consider skipping our staging and publish the upload
 right away. This can save you some time and additional API calls. The upload endpoint
 has a parameter `publish_directly`. You can modify the upload command you get on the upload page as follows:
 
diff --git a/docs/develop/code.md b/docs/develop/code.md
index 0e634a48a84cba1187d214488f7e995714f43b3a..e207674c34a61ff4d6a5fbabbb2fac2502ae514f 100644
--- a/docs/develop/code.md
+++ b/docs/develop/code.md
@@ -50,7 +50,7 @@ but should help you to navigate the codebase:
 
 - `archive`: Functionality to store and access archive files. This is the storage format
   for all processed data in NOMAD. See also the docs on
-  [structured data](../learn/data.md).
+  [structured data](../explanation/data.md).
 
 - `cli`: The command line interface (based on [Click](https://click.palletsprojects.com)).
   Subcommands are structured into submodules.
@@ -60,17 +60,17 @@ but should help you to navigate the codebase:
 
 - `datamodel`: The built-in schemas (e.g. `nomad.datamodel.metainfo.simulation` used by
   all the theory parsers). The base sections and section for the shared entry structure.
-  See also the docs on the [datamodel](../learn/data.md) and
-  [processing](../learn/basics.md).
+  See also the docs on the [datamodel](../explanation/data.md) and
+  [processing](../explanation/basics.md).
 
 - `metainfo`: The Metainfo system, e.g. the schema language that NOMAD uses.
 
 - `normalizing`: All the normalizers. See also the docs on
-  [processing](../learn/basics.md#normalizing).
+  [processing](../explanation/basics.md#normalizing).
 
 - `parsing`: The base classes for parsers, matching functionality, parser initialization,
   some fundamental parsers like the *archive* parser. See also the docs on
-  [processing](../learn/basics.md#parsing).
+  [processing](../explanation/basics.md#parsing).
 
 - `processing`: It's all about processing uploads and entries. The interface to
   [Celery](https://docs.celeryq.dev/en/stable/) and [MongoDB](https://www.mongodb.com).
diff --git a/docs/learn/architecture.md b/docs/explanation/architecture.md
similarity index 100%
rename from docs/learn/architecture.md
rename to docs/explanation/architecture.md
diff --git a/docs/learn/architecture.png b/docs/explanation/architecture.png
similarity index 100%
rename from docs/learn/architecture.png
rename to docs/explanation/architecture.png
diff --git a/docs/learn/basics.md b/docs/explanation/basics.md
similarity index 100%
rename from docs/learn/basics.md
rename to docs/explanation/basics.md
diff --git a/docs/learn/data.md b/docs/explanation/data.md
similarity index 100%
rename from docs/learn/data.md
rename to docs/explanation/data.md
diff --git a/docs/learn/data.png b/docs/explanation/data.png
similarity index 100%
rename from docs/learn/data.png
rename to docs/explanation/data.png
diff --git a/docs/learn/datamodel.png b/docs/explanation/datamodel.png
similarity index 100%
rename from docs/learn/datamodel.png
rename to docs/explanation/datamodel.png
diff --git a/docs/learn/oasis-use-cases.png b/docs/explanation/oasis-use-cases.png
similarity index 100%
rename from docs/learn/oasis-use-cases.png
rename to docs/explanation/oasis-use-cases.png
diff --git a/docs/learn/oasis.md b/docs/explanation/oasis.md
similarity index 100%
rename from docs/learn/oasis.md
rename to docs/explanation/oasis.md
diff --git a/docs/learn/schema.png b/docs/explanation/schema.png
similarity index 100%
rename from docs/learn/schema.png
rename to docs/explanation/schema.png
diff --git a/docs/learn/schema_language.png b/docs/explanation/schema_language.png
similarity index 100%
rename from docs/learn/schema_language.png
rename to docs/explanation/schema_language.png
diff --git a/docs/learn/screenshot.png b/docs/explanation/screenshot.png
similarity index 100%
rename from docs/learn/screenshot.png
rename to docs/explanation/screenshot.png
diff --git a/docs/learn/stack.png b/docs/explanation/stack.png
similarity index 100%
rename from docs/learn/stack.png
rename to docs/explanation/stack.png
diff --git a/docs/learn/super_structure.png b/docs/explanation/super_structure.png
similarity index 100%
rename from docs/learn/super_structure.png
rename to docs/explanation/super_structure.png
diff --git a/docs/index.md b/docs/index.md
index 9c885241e2e8af0141e0fe17911d5c34710b4719..1b0631715ee9805ed079f60a372fd609d62e5810 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -5,17 +5,14 @@ hide: toc
 # NOMAD Documentation
 
 <!-- A single sentence that says what the product is, succinctly and memorably -->
-NOMAD is a free open-source data management platform for materials science, based on FAIR (findable, accessible, interoperable and reusable) principles.
+NOMAD is a free, and open-source data management platform for materials science, whose goal is to make scientific research data FAIR (findable, accessible, interoperable and reusable).
 
 <!-- A paragraph of one to three short sentences, that describe what the product does. -->
-NOMAD enables scientists and researchers to manage, share, and publish data.
+NOMAD provides tools for data management, sharing, and publishing.
 The platform lets you structure, explore, and analyze your data and the data of others.
-NOMAD promotes data-centered collaboration through an integrated and extendable set of tools.
 
 <!-- A third paragraph of similar length, this time explaining what need the product meets -->
-NOMAD solves the problem of not being able to use data that you can't find or that is too
-heterogenous to be use effectively.
-
+NOMAD solves the challenge of using heterogeneous and unfindable data.
 <!-- Finally, a paragraph that describes whom the product is useful for. -->
 NOMAD is useful for scientists that work with data, for research groups that need to collaborate on data, and for communities that need to build an archive of FAIR research data.
 
@@ -43,7 +40,7 @@ A series of tutorials will guide you through the main functionality of NOMAD.
 
 ### How-to guides
 
-The documentation provides step-by-step instructions for a wide range of tasks. For example:
+These docs provides step-by-step instructions for a wide range of tasks. For example:
 
 - [How to upload and publish data](data/upload.md)
 - [How to write a custom ELN](schemas/elns.md)
@@ -54,7 +51,7 @@ The documentation provides step-by-step instructions for a wide range of tasks.
 
 <div markdown="block">
 
-### Learn
+### Explanation
 
 This section provides background knowledge on what are
 schemas and structured data, how does processing work, the NOMAD architecture, and more.
@@ -79,7 +76,7 @@ data structure of for materials science together.
 - [Get support](https://nomad-lab.eu/nomad-lab/support.html)
 - [Join our online forum](https://matsci.org/c/nomad/32)
 - [Contribute](develop/contrib.md)
-- [Roadmap](https://nomad-lab.eu/nomad-lab/features.html)
+- [View our roadmap](https://nomad-lab.eu/nomad-lab/features.html)
 - [Code guidelines](develop/guides.md)
 
 Thinking about using NOMAD for your next project? Get in touch!
diff --git a/docs/schemas/basics.md b/docs/schemas/basics.md
index 8dba33bccfa2239a04aab56d495a2d215392ac79..7f8dc4a538bfe8c8e67fe9d8ef4a0f45ac63c982 100644
--- a/docs/schemas/basics.md
+++ b/docs/schemas/basics.md
@@ -1,6 +1,6 @@
 # Write NOMAD Schemas in YAML
 
-This guide explains how to write and upload NOMAD schemas in our `.archive.yaml` format. For more information on how an archive file is composed, visit the [learn section on schemas](../learn/data.md).
+This guide explains how to write and upload NOMAD schemas in our `.archive.yaml` format. For more information on how an archive file is composed, visit the [learn section on schemas](../explanation/data.md).
 
 ## Example data
 
diff --git a/docs/tutorial/access_api.md b/docs/tutorial/access_api.md
index 5b145b5b37c55e93cb316b9c8dff982f6c0d0b02..2330e9c1ae58bd6a725377ada71d469ad0d6c502 100644
--- a/docs/tutorial/access_api.md
+++ b/docs/tutorial/access_api.md
@@ -1,5 +1,5 @@
 This video tutorial explains the basics of API and shows how to do simple requests
-against the NOMAD api.
+against the NOMAD API.
 
 !!! note
     The NOMAD seen in the tutorials is an older version with a different color theme,
diff --git a/docs/tutorial/custom.md b/docs/tutorial/custom.md
index 82dd3ca4b3cb86a1b76806babba932cad8cd325e..964dcdaf97ff32c7c250a47a2e79be0c004ec120 100644
--- a/docs/tutorial/custom.md
+++ b/docs/tutorial/custom.md
@@ -38,11 +38,11 @@ definitions:
 
 ## The built-in tabular parser
 
-NOMAD provides a standard parser to import your data from a spreadsheet file (`Excel` file with .xlsx extension) or from a CSV file (a Comma-Separated Values file with .csv extension). There are several ways to parse a tabular data file into a structured [data file](../learn/data.md#data), depending on which structure we want to give our data. Therefore, the tabular parser can be set very flexibly, directly from the [schema file](../learn/data.md#schema) through [annotations](../schemas/elns.md#annotations).
+NOMAD provides a standard parser to import your data from a spreadsheet file (`Excel` file with .xlsx extension) or from a CSV file (a Comma-Separated Values file with .csv extension). There are several ways to parse a tabular data file into a structured [data file](../explanation/data.md#data), depending on which structure we want to give our data. Therefore, the tabular parser can be set very flexibly, directly from the [schema file](../explanation/data.md#schema) through [annotations](../schemas/elns.md#annotations).
 In this tutorial we will focus on most common modes of the tabular parser. A complete description of all modes is given in the [Reference](../reference/annotations.md#tabular_parser) section. You can also follow the dedicated [How To](../schemas/tabular.md) to see practical examples of the NOMAD tabular parser, in each section you can find a commented sample schema with a step-by-step guide on how to set it to obtain the desired final structure of your parsed data.
 We will make use of the tabular parser in a custom yaml schema. To obtain some structured data in NOMAD with this parser:<br />
 
-1) the schema files should follow the NOMAD [archive files](../learn/data.md#archive-files-a-shared-entry-structure) naming convention (i.e. `.archive.json` or `.archive.yaml` extension)<br />
+1) the schema files should follow the NOMAD [archive files](../explanation/data.md#archive-files-a-shared-entry-structure) naming convention (i.e. `.archive.json` or `.archive.yaml` extension)<br />
 2) a data file must be instantiated from the schema file<br />
 
    [comment]: <> (--> a link to the part upload etc should be inserted)
@@ -58,10 +58,10 @@ To use this parser, three kinds of annotation must be included in the schema: `t
     Some of them give rise to "not possible" data structures but are still listed for completeness, a brief explanation of why it is not possible to implement them is also provided.
     The main bring-home message is that a tabular data file can be parsed in one or more entries in NOMAD, giving rise to diverse and arbitrarily complex structures.
 
-In the following sections, two examples will be illustrated. A [tabular data file](../schemas/tabular.md#preparing-the-tabular-data-file) is parsed into one or more [data archive files](../learn/data.md#data), their structure is based on a [schema archive file](../learn/data.md#schema). NOMAD archive files are denoted as Entries.
+In the following sections, two examples will be illustrated. A [tabular data file](../schemas/tabular.md#preparing-the-tabular-data-file) is parsed into one or more [data archive files](../explanation/data.md#data), their structure is based on a [schema archive file](../explanation/data.md#schema). NOMAD archive files are denoted as Entries.
 
 !!! note
-    From the NOMAD point of view, a schema file and a data file are the same kind of file where different sections have been filled (see [archive files description](../learn/data.md#archive-files-a-shared-entry-structure)). Specifically, a schema file has its `definitions` section filled while a data file will have its `data` section filled. See [How to write a schema](../schemas/basics.md#uploading-schemas) for a more complete description of an archive file.
+    From the NOMAD point of view, a schema file and a data file are the same kind of file where different sections have been filled (see [archive files description](../explanation/data.md#archive-files-a-shared-entry-structure)). Specifically, a schema file has its `definitions` section filled while a data file will have its `data` section filled. See [How to write a schema](../schemas/basics.md#uploading-schemas) for a more complete description of an archive file.
 
 ### Example 1
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 3d6fa194cf68a2bb04666cb4bc8011a0862312d5..b312accde65009ce70c7e5507504f10136a2b1be 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -9,7 +9,7 @@ nav:
     - Exploring data on: tutorial/explore.md
     - Access data via API: tutorial/access_api.md
     - Built in schemas: tutorial/builtin.md
-    - Custom schemas: tutorial/custom.md
+    - Schemas: tutorial/custom.md
     - Plugins: tutorial/plugins.md
     - Third-party integration: tutorial/third_party.md
   - How-to guides:
@@ -47,11 +47,11 @@ nav:
       - How to customize an Oasis: oasis/customize.md
       - How to migrate Oasis versions: oasis/migrate.md
       - Administrative tasks: oasis/admin.md
-  - Learn:
-    - From files to data: learn/basics.md
-    - Structured data: learn/data.md
-    - Architecture: learn/architecture.md
-    - Why you need an Oasis: learn/oasis.md
+  - Explanation:
+    - From files to data: explanation/basics.md
+    - Structured data: explanation/data.md
+    - Architecture: explanation/architecture.md
+    - Why you need an Oasis: explanation/oasis.md
   - Reference:
     - reference/config.md
     - reference/annotations.md