diff --git a/tildes/scss/modules/_group.scss b/tildes/scss/modules/_group.scss
index cea0e25..2765678 100644
--- a/tildes/scss/modules/_group.scss
+++ b/tildes/scss/modules/_group.scss
@@ -14,6 +14,12 @@
   .group-subscription-count {
     margin-bottom: 0.2rem;
   }
+
+  @for $indent-level from 1 through 4 {
+    tr.group-level-#{$indent-level} td:first-child {
+      padding-left: #{$indent-level}rem;
+    }
+  }
 }
 
 .group-list-description {
diff --git a/tildes/tildes/templates/groups.jinja2 b/tildes/tildes/templates/groups.jinja2
index 102095a..02cca0d 100644
--- a/tildes/tildes/templates/groups.jinja2
+++ b/tildes/tildes/templates/groups.jinja2
@@ -22,7 +22,7 @@
     </thead>
     <tbody>
       {% for group in groups %}
-        <tr>
+        <tr class="group-level-{{ group.path|length - 1 }}">
           <td>
             {{ group_linked(group.path) }}
             {% if group.short_description %}
diff --git a/tildes/tildes/templates/topic.jinja2 b/tildes/tildes/templates/topic.jinja2
index 467f339..7ed3755 100644
--- a/tildes/tildes/templates/topic.jinja2
+++ b/tildes/tildes/templates/topic.jinja2
@@ -26,7 +26,11 @@
 {% endblock %}
 
 {% block header_context_link %}
-<a class="site-header-context" href="/~{{ topic.group.path }}">~{{ topic.group.path }}</a>
+  {# Split the link out for each "segment" of the group path #}
+  <a class="site-header-context" href="/~{{ topic.group.path[0:1] }}">~{{ topic.group.path[0:1] }}</a>
+  {% for i in range(1, topic.group.path|length) %}
+    .<a class="site-header-context" href="/~{{ topic.group.path[0:i+1] }}">{{ topic.group.path[i:i+1] }}</a>
+  {% endfor %}
 {% endblock %}
 
 {% block content %}
diff --git a/tildes/tildes/templates/topic_listing.jinja2 b/tildes/tildes/templates/topic_listing.jinja2
index 7eec9fd..37d3fec 100644
--- a/tildes/tildes/templates/topic_listing.jinja2
+++ b/tildes/tildes/templates/topic_listing.jinja2
@@ -224,6 +224,17 @@
     {{ group.sidebar_rendered_html|safe }}
   {% endif %}
 
+  {% if subgroups %}
+    <ul class="nav">
+      <li>Subgroups</li>
+      <ul class="nav">
+      {% for subgroup in subgroups %}
+        <li class="nav-item">{{ group_linked(subgroup.path) }}</li>
+      {% endfor %}
+      </ul>
+    </ul>
+  {% endif %}
+
   {% if wiki_pages or wiki_has_index %}
     <ul class="nav">
       <li>Group wiki pages</li>
diff --git a/tildes/tildes/views/topic.py b/tildes/tildes/views/topic.py
index b6b96a6..0bcf25c 100644
--- a/tildes/tildes/views/topic.py
+++ b/tildes/tildes/views/topic.py
@@ -157,10 +157,17 @@ def get_group_topics(
             groups = [
                 group for group in request.query(Group).all() if group.path != "test"
             ]
+        subgroups = None
     else:
         # otherwise, just topics from the single group that we're looking at
         groups = [request.context]
 
+        subgroups = [
+            group
+            for group in request.query(Group).all()
+            if group.is_subgroup_of(request.context)
+        ]
+
     default_settings = _get_default_settings(request, order)
 
     if order is missing:
@@ -245,6 +252,7 @@ def get_group_topics(
         "unfiltered": unfiltered,
         "wiki_pages": wiki_pages,
         "wiki_has_index": wiki_has_index,
+        "subgroups": subgroups,
     }