diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index ffd981c290804d63923badf8cb282988feab3375..8f4b21b4683b5e77e3f16c492761c7ce78012fc4 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -39,11 +39,13 @@ urlpatterns = [
     url(r"^tickets$", RedirectView.as_view(url="attend")),
     url(r"^tickets/buy$", views.buy_ticket, name="buy_ticket"),
     url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"),
-    
-    url(r"^opportunity-grant$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="opportunity-grant"),
+
+    url(r"^opportunity-grant$", TemplateView.as_view(template_name="static_pages/opportunity-grant.html"), name="opportunity-grant"),
+    url(r"^attend/finaid$", RedirectView.as_view(url="/opportunity-grant")),
     url(r"^attend/finaid$", RedirectView.as_view(url="/opportunity-grant")),
     url(r"^attend/financial-aid$", RedirectView.as_view(url="/opportunity-grant")),
-    
+
+    url(r"^attend/stay$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"),
     url(r"^attend/travel$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"),
     url(r"^attend/hotels$", TemplateView.as_view(template_name="static_pages/attend/hotels.html"), name="attend/hotels"),
     url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"),
@@ -55,9 +57,9 @@ urlpatterns = [
     url(r"^guide$", RedirectView.as_view(url="guides")),
 
     # go
-    url(r"^go/fly$", TemplateView.as_view(template_name="static_pages/attend/fly.html"), name="go/fly"),
-    url(r"^go/stay$", TemplateView.as_view(template_name="static_pages/attend/stay.html"), name="go/stay"),
-    url(r"^go/day-trip$", TemplateView.as_view(template_name="static_pages/attend/day-trip.html"), name="go/day-trip`"),
+    url(r"^go/fly$", TemplateView.as_view(template_name="static_pages/go/fly.html"), name="go/fly"),
+    url(r"^go/stay$", TemplateView.as_view(template_name="static_pages/go/stay.html"), name="go/stay"),
+    url(r"^go/day-trip$", TemplateView.as_view(template_name="static_pages/go/day-trip.html"), name="go/day-trip`"),
 
     url(r"^safety$", TemplateView.as_view(template_name="static_pages/safety.html"), name="safety"),
     url(r"^emergencies$", RedirectView.as_view(url="safety")),