diff --git a/PlotLine/Views/Analytics/Index.cshtml b/PlotLine/Views/Analytics/Index.cshtml
index 2066e9d..9027708 100644
--- a/PlotLine/Views/Analytics/Index.cshtml
+++ b/PlotLine/Views/Analytics/Index.cshtml
@@ -45,10 +45,6 @@
         <p class="eyebrow">Analytics / Story health</p>
         <h1>@Model.Project.ProjectName <help-icon key="storyHealth.overview" /></h1>
     </div>
-    <div class="button-row">
-        <a class="btn btn-outline-primary" asp-controller="Timeline" asp-action="Index" asp-route-projectId="@Model.Project.ProjectID" asp-route-bookId="@Model.BookID">Timeline</a>
-        <a class="btn btn-outline-secondary" asp-controller="Warnings" asp-action="Index" asp-route-projectId="@Model.Project.ProjectID" asp-route-bookId="@Model.BookID">Warnings</a>
-    </div>
 </div>
 
 <section class="warning-filter-panel">
diff --git a/PlotLine/Views/Locations/Details.cshtml b/PlotLine/Views/Locations/Details.cshtml
index 888c2c4..c5bffff 100644
--- a/PlotLine/Views/Locations/Details.cshtml
+++ b/PlotLine/Views/Locations/Details.cshtml
@@ -23,7 +23,6 @@
         </div>
         <div class="button-row">
             <a class="btn btn-outline-secondary" asp-action="Edit" asp-route-id="@Model.Location.LocationID">Edit</a>
-            <a class="btn btn-outline-secondary" asp-controller="Timeline" asp-action="Index" asp-route-ProjectID="@Model.Project.ProjectID" asp-route-SelectedSceneID="@firstScene?.SceneID" asp-route-FocusType="location" asp-route-FocusID="@Model.Location.LocationID">Back to timeline</a>
             <a class="btn btn-outline-primary" asp-action="Index" asp-route-projectId="@Model.Project.ProjectID">All locations</a>
             <form asp-action="Archive" method="post" class="archive-button-form" data-confirm-message="Archive this location?&#10;&#10;This will hide it from active lists and timelines, but the data will be kept and can be restored later.">
                 <input type="hidden" name="id" value="@Model.Location.LocationID" />
diff --git a/PlotLine/Views/Locations/Edit.cshtml b/PlotLine/Views/Locations/Edit.cshtml
index 262273d..1fedbaf 100644
--- a/PlotLine/Views/Locations/Edit.cshtml
+++ b/PlotLine/Views/Locations/Edit.cshtml
@@ -1,6 +1,19 @@
 @model LocationEditViewModel
 @{
     ViewData["Title"] = Model.LocationID == 0 ? "New Location" : "Edit Location";
+    ViewData["ProjectSection"] = "Locations";
+}
+
+@if (Model.Project is not null)
+{
+    <nav class="breadcrumb-trail" aria-label="Breadcrumb">
+        <a asp-controller="Projects" asp-action="Index">Projects</a>
+        <a asp-controller="Projects" asp-action="Details" asp-route-id="@Model.Project.ProjectID">@Model.Project.ProjectName</a>
+        <a asp-action="Index" asp-route-projectId="@Model.ProjectID">Locations</a>
+        <span>@ViewData["Title"]</span>
+    </nav>
+
+    <partial name="_ProjectSectionNav" model="Model.Project" />
 }
 
 <div class="page-heading compact">
diff --git a/PlotLine/Views/PlotThreads/Edit.cshtml b/PlotLine/Views/PlotThreads/Edit.cshtml
index aa2f608..f263e03 100644
--- a/PlotLine/Views/PlotThreads/Edit.cshtml
+++ b/PlotLine/Views/PlotThreads/Edit.cshtml
@@ -22,7 +22,7 @@
         <h1>@ViewData["Title"] <help-icon key="plotThreads.edit" /></h1>
     </div>
     <div class="button-row">
-        <a class="btn btn-outline-secondary" asp-action="Index" asp-route-projectId="@Model.ProjectID">Back to plot threads</a>
+        <a class="btn btn-outline-secondary" asp-action="Index" asp-route-projectId="@Model.ProjectID">Cancel</a>
         @if (Model.PlotThreadID > 0)
         {
             <form asp-action="Archive" method="post" class="archive-button-form" data-confirm-message="Archive this plot thread?&#10;&#10;This will hide it from active lists and timelines, but the data will be kept and can be restored later.">
diff --git a/PlotLine/Views/ProjectMetrics/Index.cshtml b/PlotLine/Views/ProjectMetrics/Index.cshtml
index 21660e6..1bea955 100644
--- a/PlotLine/Views/ProjectMetrics/Index.cshtml
+++ b/PlotLine/Views/ProjectMetrics/Index.cshtml
@@ -18,10 +18,6 @@
         <h1>Scene Metrics <help-icon key="sceneMetrics.overview" /></h1>
         <p class="lead-text">Create and manage the metric sliders available when editing scenes.</p>
     </div>
-    <div class="button-row">
-        <a class="btn btn-outline-secondary" asp-controller="Timeline" asp-action="Settings" asp-route-projectId="@Model.Project.ProjectID">Timeline Settings</a>
-        <a class="btn btn-outline-secondary" asp-controller="Projects" asp-action="Details" asp-route-id="@Model.Project.ProjectID">Back to project</a>
-    </div>
 </div>
 
 @if (TempData["ProjectMetricMessage"] is string message)
diff --git a/PlotLine/Views/StoryAssets/Details.cshtml b/PlotLine/Views/StoryAssets/Details.cshtml
index 1429299..2a17246 100644
--- a/PlotLine/Views/StoryAssets/Details.cshtml
+++ b/PlotLine/Views/StoryAssets/Details.cshtml
@@ -24,7 +24,6 @@
     </div>
     <div class="button-row">
         <a class="btn btn-outline-secondary" asp-action="Index" asp-route-projectId="@Model.Project.ProjectID">Story assets</a>
-        <a class="btn btn-outline-secondary" asp-controller="Timeline" asp-action="Index" asp-route-ProjectID="@Model.Project.ProjectID" asp-route-SelectedSceneID="@firstSceneId" asp-route-FocusType="asset" asp-route-FocusID="@Model.Asset.StoryAssetID">Back to timeline</a>
         <a class="btn btn-outline-primary" asp-action="Edit" asp-route-id="@Model.Asset.StoryAssetID">Edit asset</a>
         <form asp-action="Archive" method="post" class="archive-button-form" data-confirm-message="Archive this asset?&#10;&#10;This will hide it from active lists and timelines, but the data will be kept and can be restored later.">
             <input type="hidden" name="id" value="@Model.Asset.StoryAssetID" />