diff --git a/docs/getting-started/standalone-install.md b/docs/getting-started/standalone-install.md
index dd730183b5..a7b024eb2d 100644
--- a/docs/getting-started/standalone-install.md
+++ b/docs/getting-started/standalone-install.md
@@ -155,8 +155,8 @@ Choose the correct next steps for your user role, if you're likely to be deployi
 ### Developer
 
 - [Logging into Backstage](./logging-in.md)
-- Register a component
-- Create a new component
+- [Register a component](./register-a-component.md)
+- [Create a new component](./create-a-component.md)
 
 Share your experiences, comments, or suggestions with us:
 [on discord](https://discord.gg/backstage-687207715902193673), file issues for any
diff --git a/mkdocs.yml b/mkdocs.yml
index 2a17613672..b0ac4f0e4c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -20,11 +20,16 @@ nav:
       - Support and community: 'overview/support.md'
       - Logo assets: 'overview/logos.md'
   - Getting Started:
-      - Getting Started: 'getting-started/index.md'
-      - Create an App: 'getting-started/create-an-app.md'
-      - App configuration:
+      - Installing a standalone server (Developer or Admin): 'getting-started/standalone-install.md'
+      - Configuring Backstage (Admin):
+          - Database: 'getting-started/config/database.md'
+          - Authentication: 'getting-started/config/authentication.md'
           - Configuring App with plugins: 'getting-started/configure-app-with-plugins.md'
           - Customize the look-and-feel of your App: 'getting-started/app-custom-theme.md'
+          - Customizing your Homepage: 'getting-started/homepage.md'
+      - Logging in: 'getting-started/logging-in.md'
+      - Register a component: 'getting-started/register-a-component.md'
+      - Create a component: 'getting-started/create-a-component.md'
       - Keeping Backstage Updated: 'getting-started/keeping-backstage-updated.md'
       - Key Concepts: 'getting-started/concepts.md'
       - Project Structure: 'getting-started/project-structure.md'
@@ -210,8 +215,8 @@ nav:
       - ADR009 - Entity References: 'architecture-decisions/adr009-entity-references.md'
       - ADR010 - Luxon Date Library: 'architecture-decisions/adr010-luxon-date-library.md'
       - ADR011 - Plugin Package Structure: 'architecture-decisions/adr011-plugin-package-structure.md'
-      - ADR012 - Plugin Package Structure: 'architecture-decisions/adr012-use-luxon-locale-and-date-presets.md'
-      - ADR013 - Plugin Package Structure: 'architecture-decisions/adr013-use-node-fetch.md'
+      - ADR012 - Use Luxon Locale: 'architecture-decisions/adr012-use-luxon-locale-and-date-presets.md'
+      - ADR013 - Use node-fetch: 'architecture-decisions/adr013-use-node-fetch.md'
   - FAQ:
       - Overview: 'faq/index.md'
       - Product FAQ: 'faq/product.md'