diff --git a/rmo/root.go b/rmo/root.go
index 82e5a8f1..38097fc7 100644
--- a/rmo/root.go
+++ b/rmo/root.go
@@ -27,6 +27,7 @@ type ContentURL struct {
 	Status         string
 	Tegola         string
 	Water          string
+	WaterSubmit    string
 }
 
 var (
@@ -102,15 +103,17 @@ func makeContentURL(district *models.Organization) ContentURL {
 			Status:         makeURL("/status"),
 			Tegola:         config.MakeURLTegola("/"),
 			Water:          makeURL("/water"),
+			WaterSubmit:    makeURL("/water"),
 		}
 	} else {
 		slug := district.Slug.MustGet()
 		return ContentURL{
 			Nuisance:       makeURL("/district/%s/nuisance", slug),
-			NuisanceSubmit: makeURL("/district/%s/nuisance", slug),
+			NuisanceSubmit: makeURL("/nuisance", slug),
 			Status:         makeURL("/status"),
 			Tegola:         config.MakeURLTegola("/"),
 			Water:          makeURL("/district/%s/water", slug),
+			WaterSubmit:    makeURL("/water"),
 		}
 	}
 }
diff --git a/rmo/routes.go b/rmo/routes.go
index cd959ef7..d672d263 100644
--- a/rmo/routes.go
+++ b/rmo/routes.go
@@ -12,19 +12,20 @@ func Router() chi.Router {
 	r.Post("/nuisance", postNuisance)
 	r.Get("/submit-complete", getSubmitComplete)
 	r.Get("/water", getWater)
+	r.Post("/water", postWater)
 
 	r.Get("/district/{slug}", getRootDistrict)
 	r.Get("/district/{slug}/nuisance", getNuisanceDistrict)
 	//r.Get("/district/{slug}/nuisance-submit-complete", renderMock(mockNuisanceSubmitCompleteT))
 	//r.Get("/district/{slug}/status", renderMock(mockStatusT))
 	r.Get("/district/{slug}/water", getWaterDistrict)
+	//r.Post("/district/{slug}/water", postWaterDistrict)
 
 	r.Get("/privacy", getPrivacy)
 	r.Get("/robots.txt", getRobots)
 	r.Get("/email", getEmailByCode)
 	r.Get("/image/{uuid}", getImageByUUID)
 	r.Route("/mock", addMockRoutes)
-	r.Post("/pool-submit", postPool)
 	r.Get("/pool-submit-complete", getPoolSubmitComplete)
 	r.Get("/quick", getQuick)
 	r.Post("/quick-submit", postQuick)
diff --git a/rmo/template/water.html b/rmo/template/water.html
index 5b1249a3..8e2b91e6 100644
--- a/rmo/template/water.html
+++ b/rmo/template/water.html
@@ -156,7 +156,7 @@ document.addEventListener('DOMContentLoaded', function() {
 		</div>
 
 		<!-- Report Form -->
-		<form id="standingWater" action="/water-submit" method="POST" enctype="multipart/form-data">
+		<form id="standingWater" action="{{ .URL.WaterSubmit }}" method="POST" enctype="multipart/form-data">
 			<!-- Photo Upload Section -->
 			<div class="form-section">
 				<div class="section-heading">
@@ -377,9 +377,9 @@ document.addEventListener('DOMContentLoaded', function() {
 						<p class="mb-0 small text-muted">After submission, you will receive a confirmation with a report ID for tracking purposes.</p>
 					</div>
 					<div class="col-md-4 text-md-end mt-3 mt-md-0">
-						<a  class="btn btn-primary btn-lg" href="{{.URL.SubmitComplete}}">
+						<button type="submit" class="btn btn-primary btn-lg">
 							Submit Report
-						</a>
+						</button>
 					</div>
 				</div>
 			</div>
diff --git a/rmo/water.go b/rmo/water.go
index 14e2d18a..5fa91528 100644
--- a/rmo/water.go
+++ b/rmo/water.go
@@ -38,7 +38,9 @@ func getWater(w http.ResponseWriter, r *http.Request) {
 		w,
 		WaterT,
 		ContentPool{
+			District:    nil,
 			MapboxToken: config.MapboxToken,
+			URL:         makeContentURL(nil),
 		},
 	)
 }
@@ -54,6 +56,7 @@ func getWaterDistrict(w http.ResponseWriter, r *http.Request) {
 		ContentPool{
 			District:    newContentDistrict(district),
 			MapboxToken: config.MapboxToken,
+			URL:         makeContentURL(district),
 		},
 	)
 }
@@ -67,7 +70,7 @@ func getPoolSubmitComplete(w http.ResponseWriter, r *http.Request) {
 		},
 	)
 }
-func postPool(w http.ResponseWriter, r *http.Request) {
+func postWater(w http.ResponseWriter, r *http.Request) {
 	err := r.ParseMultipartForm(32 << 10) // 32 MB buffer
 	if err != nil {
 		respondError(w, "Failed to parse form", err, http.StatusBadRequest)
@@ -193,3 +196,5 @@ func postPool(w http.ResponseWriter, r *http.Request) {
 	tx.Commit(ctx)
 	http.Redirect(w, r, fmt.Sprintf("/pool-submit-complete?report=%s", public_id), http.StatusFound)
 }
+func postWaterDistrict(w http.ResponseWriter, r *http.Request) {
+}