diff --git a/templates/navigation/workspace_navigation.html b/templates/navigation/workspace_navigation.html
index 6f311cca..fd767205 100644
--- a/templates/navigation/workspace_navigation.html
+++ b/templates/navigation/workspace_navigation.html
@@ -2,15 +2,6 @@
 
 <nav class='sidenav workspace-navigation'>
   <ul>
-    {% if user_can(permissions.EDIT_WORKSPACE_INFORMATION) %}
-      {{ SidenavItem(
-        "Edit Workspace",
-        href=url_for("workspaces.workspace", workspace_id=workspace.id),
-        active=request.url_rule.rule.startswith('/workspaces/<workspace_id>/edit'),
-        subnav=None
-      ) }}
-    {% endif %}
-
     {{ SidenavItem(
       "Projects",
       href=url_for("workspaces.workspace_projects", workspace_id=workspace.id),
@@ -44,5 +35,15 @@
       href=url_for("workspaces.workspace_reports", workspace_id=workspace.id),
       active=request.url_rule.rule.startswith('/workspaces/<workspace_id>/reports')
     ) }}
+
+    {% if user_can(permissions.EDIT_WORKSPACE_INFORMATION) %}
+      {{ SidenavItem(
+        "Workspace Settings",
+        href=url_for("workspaces.workspace", workspace_id=workspace.id),
+        active=request.url_rule.rule.startswith('/workspaces/<workspace_id>/edit'),
+        subnav=None
+      ) }}
+    {% endif %}
+
   </ul>
 </nav>
diff --git a/templates/workspaces/edit.html b/templates/workspaces/edit.html
index dccbd40a..45e35656 100644
--- a/templates/workspaces/edit.html
+++ b/templates/workspaces/edit.html
@@ -20,7 +20,7 @@
   <div class="panel">
 
     <div class="panel__heading">
-      <h1>Edit Workspace</h1>
+      <h1>Workspace Settings</h1>
     </div>
 
     <div class="panel__content">
@@ -30,7 +30,7 @@
 
 
   <div class='action-group'>
-    <button type="submit" class="usa-button usa-button-big usa-button-primary" tabindex="0">Submit</button>
+    <button type="submit" class="usa-button usa-button-big usa-button-primary" tabindex="0">Save</button>
     <a href='{{ url_for("workspaces.workspace_projects", workspace_id=workspace.id) }}' class='action-group__action icon-link'>
       {{ Icon('x') }}
       <span>Cancel</span>