diff --git a/plinth/modules/dynamicdns/__init__.py b/plinth/modules/dynamicdns/__init__.py
index c22e5ddae..3d0c46f13 100644
--- a/plinth/modules/dynamicdns/__init__.py
+++ b/plinth/modules/dynamicdns/__init__.py
@@ -75,7 +75,7 @@ def setup(helper, old_version=None):
 
 
 def get_enabled_services(domain_name):
-    """ Get enabled services for the domain name"""
+    """Get enabled services for the domain name."""
     if domain_name != None and domain_name != '':
         try:
             domainname_services = firewall.get_enabled_services(
diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html
index dd252cc69..e15861018 100644
--- a/plinth/modules/dynamicdns/templates/dynamicdns.html
+++ b/plinth/modules/dynamicdns/templates/dynamicdns.html
@@ -21,48 +21,25 @@
 {% load i18n %}
 {% load plinth_extras %}
 
-{% block content %}
-  {% block pagetitle %}
-    <h2>{{ title }}</h2>
-  {% endblock %}
+{% block configuration %}
 
-  {% for paragraph in description %}
-    <p>{{ paragraph|safe }}</p>
-  {% endfor %}
+  <p>
+    {% blocktrans trimmed %}
+      If you are looking for a free dynamic DNS account, you may find
+      a free GnuDIP service at <a href='http://gnudip.datasystems24.net'
+      target='_blank'>gnudip.datasystems24.net</a> or you may find
+      free update URL based services at
+      <a href='http://freedns.afraid.org/' target='_blank'>
+      freedns.afraid.org</a>.
+    {% endblocktrans %}
+  </p>
 
-  {% if manual_page %}
-    <p class="manual-page">
-      <a href="{% url 'help:manual-page' manual_page %}">
-        {% trans 'Learn more...' %}
-      </a>
-    </p>
-  {% endif %}
-
-  {% block subsubmenu %}
-    {% if subsubmenu %}
-      {% show_subsubmenu subsubmenu %}
-    {% endif %}
-  {% endblock %}
-
-  {% block subpage %}
-    <p>
-      {% blocktrans trimmed %}
-        If you are looking for a free dynamic DNS account, you may find
-        a free GnuDIP service at <a href='http://gnudip.datasystems24.net'
-                                    target='_blank'>gnudip.datasystems24.net</a> or you may find
-        free update URL based services at
-        <a href='http://freedns.afraid.org/' target='_blank'>
-          freedns.afraid.org</a>.
-      {% endblocktrans %}
-    </p>
-
-    <p>
-      {% blocktrans trimmed %}
-        If your {{ box_name }} is connected behind a NAT router, don't forget
-        to add port forwarding for standard ports, including TCP port 80 (HTTP)
-        and TCP port 443 (HTTPS).
-      {% endblocktrans %}
-    </p>
-  {% endblock %}
+  <p>
+    {% blocktrans trimmed %}
+      If your {{ box_name }} is connected behind a NAT router, don't forget
+      to add port forwarding for standard ports, including TCP port 80 (HTTP)
+      and TCP port 443 (HTTPS).
+    {% endblocktrans %}
+  </p>
 
 {% endblock %}
diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html b/plinth/modules/dynamicdns/templates/dynamicdns_configure.html
index 1d5684720..2a8115658 100644
--- a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html
+++ b/plinth/modules/dynamicdns/templates/dynamicdns_configure.html
@@ -1,4 +1,4 @@
-{% extends "dynamicdns.html" %}
+{% extends "service-subsubmenu.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -22,7 +22,7 @@
 {% load i18n %}
 {% load static %}
 
-{% block subpage %}
+{% block configuration %}
   <form class="form" method="post">
     {% csrf_token %}
 
diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_status.html b/plinth/modules/dynamicdns/templates/dynamicdns_status.html
index 155c73b20..69a25321c 100644
--- a/plinth/modules/dynamicdns/templates/dynamicdns_status.html
+++ b/plinth/modules/dynamicdns/templates/dynamicdns_status.html
@@ -1,4 +1,4 @@
-{% extends "dynamicdns.html" %}
+{% extends "service-subsubmenu.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -20,7 +20,7 @@
 
 {% load i18n %}
 
-{% block subpage %}
+{% block configuration %}
   <h3>{% trans "NAT type" %}</h3>
 
   <p>