diff --git a/content/en/docs/faq.md b/content/en/docs/faq.md
index 6757961..3ba6925 100644
--- a/content/en/docs/faq.md
+++ b/content/en/docs/faq.md
@@ -1,7 +1,7 @@
 ---
 title: Frequently Asked Questions
 LinkTitle: FAQ
-weight: 450
+weight: 800
 description: Get your questions answered!
 aliases: [/faq]
 ---
diff --git a/content/en/docs/overview/metadata.md b/content/en/docs/metadata.md
similarity index 98%
rename from content/en/docs/overview/metadata.md
rename to content/en/docs/metadata.md
index 1fb2072..a6bd165 100644
--- a/content/en/docs/overview/metadata.md
+++ b/content/en/docs/metadata.md
@@ -1,9 +1,7 @@
 ---
 title: Roles and Metadata
-LinkTitle: Metadata
-weight: 15
-description: Understand Roles and Metadata
 aliases: [/metadata]
+weight: 300
 ---
 
 TUF uses roles to define the set of actions a party can perform. The concept of
@@ -85,13 +83,13 @@ available from a given repository mirror.
 
 A delegated role file is located at:
 
-/DELEGATED_ROLE.json
+`/DELEGATED_ROLE.json`
 
 where DELEGATED_ROLE is the name of the role specified in targets.json. If this
 role further delegates trust to a role named ANOTHER_ROLE, that role's signed
 metadata file would be found at:
 
-/ANOTHER_ROLE.json
+`/ANOTHER_ROLE.json`
 
 See
 [example](https://raw.githubusercontent.com/theupdateframework/tuf/develop/tests/repository_data/repository/metadata/role1.json)
diff --git a/content/en/docs/overview/_index.md b/content/en/docs/overview.md
similarity index 100%
rename from content/en/docs/overview/_index.md
rename to content/en/docs/overview.md
diff --git a/content/en/docs/project/_index.md b/content/en/docs/project/_index.md
index 7a1b3f0..4636c40 100644
--- a/content/en/docs/project/_index.md
+++ b/content/en/docs/project/_index.md
@@ -1,7 +1,7 @@
 ---
 title: Project
 aliases: [/project]
-weight: 400
+weight: 600
 ---
 
 The TUF project consists of three components:
diff --git a/content/en/docs/project/history.md b/content/en/docs/project/history.md
index 571d507..ac3ba79 100644
--- a/content/en/docs/project/history.md
+++ b/content/en/docs/project/history.md
@@ -35,5 +35,4 @@ four core principles continue to be central to its design.
   reduces the risk that they can be stolen or compromised. In 2016, the TUF
   research group set up a process whereby the community could
 
-[paper]:
-  https://theupdateframework.github.io/papers/survivable-key-compromise-ccs2010.pdf?raw=true
+[paper]: /papers/survivable-key-compromise-ccs2010.pdf
diff --git a/content/en/docs/security/_index.md b/content/en/docs/security/_index.md
index 978fc5f..270c687 100644
--- a/content/en/docs/security/_index.md
+++ b/content/en/docs/security/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Security
-weight: 300
+weight: 400
 description: Security properties of TUF repositories
 aliases: [/security]
 ---