diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 32b5062dc..22aba08e4 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 
 {% block header %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/layout.html
similarity index 100%
rename from bookwyrm/templates/user/user_layout.html
rename to bookwyrm/templates/user/layout.html
diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/relationships/followers.html
similarity index 96%
rename from bookwyrm/templates/user/followers.html
rename to bookwyrm/templates/user/relationships/followers.html
index 2a7ccd1e9..c69416dce 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/relationships/followers.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/relationships/following.html
similarity index 96%
rename from bookwyrm/templates/user/following.html
rename to bookwyrm/templates/user/relationships/following.html
index b41d51264..a1feeb76a 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/relationships/following.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 
diff --git a/bookwyrm/templates/user/books_header.html b/bookwyrm/templates/user/shelf/books_header.html
similarity index 100%
rename from bookwyrm/templates/user/books_header.html
rename to bookwyrm/templates/user/shelf/books_header.html
diff --git a/bookwyrm/templates/user/create_shelf_form.html b/bookwyrm/templates/user/shelf/create_shelf_form.html
similarity index 100%
rename from bookwyrm/templates/user/create_shelf_form.html
rename to bookwyrm/templates/user/shelf/create_shelf_form.html
diff --git a/bookwyrm/templates/user/edit_shelf_form.html b/bookwyrm/templates/user/shelf/edit_shelf_form.html
similarity index 100%
rename from bookwyrm/templates/user/edit_shelf_form.html
rename to bookwyrm/templates/user/shelf/edit_shelf_form.html
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
similarity index 94%
rename from bookwyrm/templates/user/shelf.html
rename to bookwyrm/templates/user/shelf/shelf.html
index 336162588..93f0c15f2 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -1,16 +1,16 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load bookwyrm_tags %}
 {% load humanize %}
 {% load i18n %}
 
 {% block title %}
-{% include 'user/books_header.html' %}
+{% include 'user/shelf/books_header.html' %}
 {% endblock %}
 
 {% block header %}
 <header class="columns">
     <h1 class="title">
-        {% include 'user/books_header.html' %}
+        {% include 'user/shelf/books_header.html' %}
     </h1>
 </header>
 {% endblock %}
@@ -41,7 +41,7 @@
 </div>
 
 <div class="block">
-    {% include 'user/create_shelf_form.html' with controls_text='create-shelf-form' %}
+    {% include 'user/shelf/create_shelf_form.html' with controls_text='create-shelf-form' %}
 </div>
 
 <div class="block columns is-mobile">
@@ -62,7 +62,7 @@
 </div>
 
 <div class="block">
-    {% include 'user/edit_shelf_form.html' with controls_text="edit-shelf-form" %}
+    {% include 'user/shelf/edit_shelf_form.html' with controls_text="edit-shelf-form" %}
 </div>
 
 <div class="block">
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index a97d26ab8..fead8fcf6 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 
@@ -11,7 +11,7 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        <a href="/preferences/profile">
+        <a href="{% url 'prefs-profile' %}">
             <span class="icon icon-pencil" title="Edit profile">
                 <span class="is-sr-only">{% trans "Edit profile" %}</span>
             </span>
@@ -25,7 +25,7 @@
 {% if user.bookwyrm_user %}
 <div class="block">
     <h2 class="title">
-        {% include 'user/books_header.html' %}
+        {% include 'user/shelf/books_header.html' %}
     </h2>
     <div class="columns">
         {% for shelf in shelves %}
@@ -56,7 +56,7 @@
 {% elif user == request.user %}
 <div class="block">
     {% now 'Y' as year %}
-    <h2 class="title is-4"><a href="{{ user.local_path }}/goal/{{ year }}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
+    <h2 class="title is-4"><a href="{% url 'user-goal' user.localname year %}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
 </div>
 {% endif %}
 
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 9bcf0a4ac..ca05ec1ee 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -68,7 +68,7 @@ class Shelf(View):
             "books": paginated.get_page(request.GET.get("page")),
         }
 
-        return TemplateResponse(request, "user/shelf.html", data)
+        return TemplateResponse(request, "user/shelf/shelf.html", data)
 
     @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index d394c1d73..af31fd47f 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -112,7 +112,7 @@ class Followers(View):
             "is_self": request.user.id == user.id,
             "followers": paginated.page(request.GET.get("page", 1)),
         }
-        return TemplateResponse(request, "user/followers.html", data)
+        return TemplateResponse(request, "user/relationships/followers.html", data)
 
 
 class Following(View):
@@ -138,7 +138,7 @@ class Following(View):
             "is_self": request.user.id == user.id,
             "following": paginated.page(request.GET.get("page", 1)),
         }
-        return TemplateResponse(request, "user/following.html", data)
+        return TemplateResponse(request, "user/relationships/following.html", data)
 
 
 @method_decorator(login_required, name="dispatch")