diff --git a/app/blueprints/self_serve/routes.py b/app/blueprints/self_serve/routes.py
index 009824b9..318bf66c 100644
--- a/app/blueprints/self_serve/routes.py
+++ b/app/blueprints/self_serve/routes.py
@@ -118,8 +118,8 @@ def view_section_questions():
 # CRUD routes
 
 # Create routes
-@self_serve_bp.route("section", methods=["GET", "POST"])
-def crud_section():
+@self_serve_bp.route("section", methods=["GET", "POST", "PUT", "DELETE"])
+def section():
     # TODO: Create frontend routes and connect to middleware
     if request.method == "GET":
         pass
@@ -147,8 +147,8 @@ def crud_section():
         # save to db here
     return render_template("create_section.html", available_forms=available_forms, form=form)
 
-@self_serve_bp.route("/form", methods=["GET", "POST"])
-def crud_form():
+@self_serve_bp.route("/form", methods=["GET", "POST", "PUT", "DELETE"])
+def form():
     # TODO: Create frontend routes and connect to middleware
     if request.method == "GET":
         pass
@@ -187,7 +187,7 @@ def crud_form():
     return render_template("create_form.html", available_pages=available_pages, form=form)
 
 @self_serve_bp.route("/page", methods=["GET", "POST", "PUT", "DELETE"])
-def crud_page():
+def page():
     # TODO: Create frontend routes and connect to middleware
     if request.method == "GET":
         pass
@@ -219,8 +219,8 @@ def crud_page():
     ]
     return render_template("create_page.html", form=form, available_questions=available_questions)
 
-@self_serve_bp.route("/question", methods=["GET", "PUT", "POST" "DELETE"])
-def crud_question():
+@self_serve_bp.route("/question", methods=["GET", "PUT", "POST", "DELETE"])
+def question():
     # TODO: Create frontend routes and connect to middleware
     if request.method == "GET":
         pass
diff --git a/app/blueprints/self_serve/templates/index.html b/app/blueprints/self_serve/templates/index.html
index 3c171948..1c831d47 100644
--- a/app/blueprints/self_serve/templates/index.html
+++ b/app/blueprints/self_serve/templates/index.html
@@ -23,19 +23,19 @@ <h2 class="govuk-heading-s">Template Setup</h2>
             <ul class="govuk-body">
                 <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.question')}}">Add a
                         Question</a></li>
-                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.question?edit=true')}}">Edit/Delete a
+                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.question', template='edit') }}">Edit/Delete a
                     Question</a></li>
                 <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.page')}}">Create a
                         Page</a></li>
-                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.page?edit=true')}}">Edit/Delete a
+                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.page', template='edit') }}">Edit/Delete a
                     Page</a></li>
                 <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.form')}}">Create an
                         Application Form</a></li>
-                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.form?edit=true')}}">Edit/Delete an
+                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.form', template='edit') }}">Edit/Delete an
                     Application Form</a></li>
                 <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.section')}}">Create a
                         Section (Group Forms)</a></li>
-                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.section?edit=true')}}">Edit/Delete a
+                <li class="govuk-body"><a class="govuk-link" href="{{ url_for('self_serve_bp.section', template='edit') }}">Edit/Delete a
                     Section</a></li>
             </ul>
             <h2 class="govuk-heading-s">Fund Metadata</h2>