diff --git a/ram/portal/templates/includes/documents.html b/ram/portal/templates/_includes/documents.html
similarity index 100%
rename from ram/portal/templates/includes/documents.html
rename to ram/portal/templates/_includes/documents.html
diff --git a/ram/portal/templates/includes/footer.html b/ram/portal/templates/_includes/footer.html
similarity index 100%
rename from ram/portal/templates/includes/footer.html
rename to ram/portal/templates/_includes/footer.html
diff --git a/ram/portal/templates/includes/header.html b/ram/portal/templates/_includes/header.html
similarity index 100%
rename from ram/portal/templates/includes/header.html
rename to ram/portal/templates/_includes/header.html
diff --git a/ram/portal/templates/includes/login.html b/ram/portal/templates/_includes/login.html
similarity index 100%
rename from ram/portal/templates/includes/login.html
rename to ram/portal/templates/_includes/login.html
diff --git a/ram/portal/templates/includes/search.html b/ram/portal/templates/_includes/search.html
similarity index 100%
rename from ram/portal/templates/includes/search.html
rename to ram/portal/templates/_includes/search.html
diff --git a/ram/portal/templates/includes/symbols.html b/ram/portal/templates/_includes/symbols.html
similarity index 100%
rename from ram/portal/templates/includes/symbols.html
rename to ram/portal/templates/_includes/symbols.html
diff --git a/ram/portal/templates/_modules/documents.html b/ram/portal/templates/_modules/documents.html
new file mode 100644
index 0000000..4331c67
--- /dev/null
+++ b/ram/portal/templates/_modules/documents.html
@@ -0,0 +1,26 @@
+                  {% if documents %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="3" scope="row">{{ header|default:"Documents" }}</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for d in documents.all %}
+                      <tr>
+                        <td class="w-33">{{ d.description }}</td>
+                        <td class="text-nowrap">
+                          {% if d.private %}
+                            <i class="bi bi-file-earmark-lock2"></i>
+                          {% else %}
+                            <i class="bi bi-file-earmark-text"></i>
+                          {% endif %}
+                          <a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a>
+                        </td>
+                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
+
diff --git a/ram/portal/templates/_modules/properties.html b/ram/portal/templates/_modules/properties.html
new file mode 100644
index 0000000..b60863f
--- /dev/null
+++ b/ram/portal/templates/_modules/properties.html
@@ -0,0 +1,18 @@
+                  {% if properties %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Properties</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for p in properties %}
+                      <tr>
+                        <th class="w-33" scope="row">{{ p.property }}</th>
+                        <td>{{ p.value }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
+
diff --git a/ram/portal/templates/_modules/purchase_data.html b/ram/portal/templates/_modules/purchase_data.html
new file mode 100644
index 0000000..f667afd
--- /dev/null
+++ b/ram/portal/templates/_modules/purchase_data.html
@@ -0,0 +1,29 @@
+                  {% if request.user.is_staff %}
+                    {% if data.shop or data.purchase_date or data.price %}
+                    <table class="table table-striped">
+                      <thead>
+                        <tr>
+                          <th colspan="2" scope="row">Purchase</th>
+                        </tr>
+                      </thead>
+                      <tbody class="table-group-divider">
+                        <tr>
+                          <th class="w-33" scope="row">Shop</th>
+                          <td>
+                            {{ data.shop|default:"-" }}
+                            {% if data.shop.website %} <a href="{{ data.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                          </td>
+                        </tr>
+                        <tr>
+                          <th class="w-33" scope="row">Purchase date</th>
+                          <td>{{ data.purchase_date|default:"-" }}</td>
+                        </tr>
+                        <tr>
+                          <th scope="row">Price ({{ site_conf.currency }})</th>
+                          <td>{{ data.price|default:"-" }}</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    {% endif %}
+                  {% endif %}
+
diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index 2ef2e1f..44d6d1a 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -148,7 +148,7 @@
               <strong>{{ site_conf.site_name }}</strong>
             </a>
          </div>
-         {% include 'includes/login.html' %}
+         {% include '_includes/login.html' %}
         </div>
       </nav>
     </header>
@@ -186,7 +186,7 @@
                 {% show_bookshelf_menu %}
                 {% show_flatpages_menu user %}
               </ul>
-              {% include 'includes/search.html' %}
+              {% include '_includes/search.html' %}
             </div>
           </div>
         </nav>
@@ -211,9 +211,9 @@
         <div class="container">{% block pagination %}{% endblock %}</div>
       </div>
       {% block extra_content %}{% endblock %}
-      {% include 'includes/symbols.html' %}
+      {% include '_includes/symbols.html' %}
     </main>
-    {% include 'includes/footer.html' %}
+    {% include '_includes/footer.html' %}
     {% if site_conf.use_cdn %}
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js"></script>
     {% else %}
diff --git a/ram/portal/templates/bookshelf/book.html b/ram/portal/templates/bookshelf/book.html
index 4e14488..d6532a8 100644
--- a/ram/portal/templates/bookshelf/book.html
+++ b/ram/portal/templates/bookshelf/book.html
@@ -147,49 +147,8 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% if request.user.is_staff %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Purchase</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                      <tr>
-                        <th class="w-33" scope="row">Shop</th>
-                        <td>
-                          {{ data.shop|default:"-" }}
-                          {% if data.shop.website %} <a href="{{ data.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
-                      </tr>
-                      <tr>
-                        <th class="w-33" scope="row">Purchase date</th>
-                        <td>{{ data.purchase_date|default:"-" }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Price ({{ site_conf.currency }})</th>
-                        <td>{{ data.price|default:"-" }}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  {% endif %}
-                  {% if properties %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Properties</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for p in properties %}
-                      <tr>
-                        <th class="w-33" scope="row">{{ p.property }}</th>
-                        <td>{{ p.value }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
+                  {% include "_modules/purchase_data.html" %}
+                  {% include "_modules/properties.html" %}
                 </div>
                 <div class="tab-pane table-responsive" id="nav-toc" role="tabpanel" aria-labelledby="nav-toc-tab">
                   <table class="table table-striped">
@@ -216,7 +175,7 @@
                   </table>
                 </div>
                 <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
-                  {% include "includes/documents.html" %}
+                  {% include "_modules/documents.html" %}
                 </div>
               </div>
               <div class="d-grid gap-2 d-md-flex justify-content-md-end">
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 3cdee98..4f71c97 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -217,49 +217,8 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% if request.user.is_staff %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Purchase</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                      <tr>
-                        <th class="w-33" scope="row">Shop</th>
-                        <td>
-                          {{ rolling_stock.shop | default:"-" }}
-                          {% if rolling_stock.shop.website %} <a href="{{ rolling_stock.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
-                      </tr>
-                      <tr>
-                        <th class="w-33" scope="row">Purchase date</th>
-                        <td>{{ rolling_stock.purchase_date | default:"-" }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Price ({{ site_conf.currency }})</th>
-                        <td>{{ rolling_stock.price | default:"-" }}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  {% endif %}
-                  {% if properties %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Properties</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for p in properties %}
-                      <tr>
-                        <th class="w-33" scope="row">{{ p.property }}</th>
-                        <td>{{ p.value }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
+                  {% include "_modules/purchase_data.html" with data=rolling_stock %}
+                  {% include "_modules/properties.html" %}
                 </div>
                 <div class="tab-pane" id="nav-class" role="tabpanel" aria-labelledby="nav-class-tab">
                   <table class="table table-striped">
@@ -296,23 +255,7 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% if class_properties %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Properties</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for p in class_properties %}
-                      <tr>
-                        <th class="w-33" scope="row">{{ p.property }}</th>
-                        <td>{{ p.value }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
+                  {% include "_modules/properties.html" with properties=class_properties %}
                 </div>
                 <div class="tab-pane" id="nav-company" role="tabpanel" aria-labelledby="nav-company-tab">
                   <table class="table table-striped">
@@ -403,8 +346,8 @@
                   </table>
                 </div>
                 <div class="tab-pane table-responsive" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
-                  {% include "includes/documents.html" %}
-                  {% include "includes/documents.html" with documents=decoder_documents header="Decoder documents" %}
+                  {% include "_modules/documents.html" %}
+                  {% include "_modules/documents.html" with documents=decoder_documents header="Decoder documents" %}
                 </div>
                 <div class="tab-pane" id="nav-journal" role="tabpanel" aria-labelledby="nav-journal-tab">
                   <table class="table table-striped">