diff --git a/docs/diagrams/README.md b/docs/diagrams/README.md
deleted file mode 100644
index 1bf344c..0000000
--- a/docs/diagrams/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Diagrams
-
-This directory provides diagrams in raw source files that are managed using
-[draw.io](https://draw.io).
-
-## Formats
-
-To use in draw.io:
-
-- for sources, use `File -> Export as -> XML` to save to this directory
-- to export as a static image, use `File -> Export as -> PNG` and save to the
-  `/docs/sources/_static` directory and use/reference accordingly
diff --git a/docs/diagrams/pygeoapi-docs-diagrams.xml b/docs/diagrams/pygeoapi-docs-diagrams.xml
deleted file mode 100644
index 06b256c..0000000
--- a/docs/diagrams/pygeoapi-docs-diagrams.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mxfile host="app.diagrams.net" modified="2020-04-07T23:53:42.576Z" agent="5.0 (Macintosh)" etag="ZmqfX0D38XZnwNZFimiD" version="12.9.9" type="google" pages="2"><diagram name="Page-1" id="5f0bae14-7c28-e335-631c-24af17079c00">7VpLU+M4EP41OULZlp9HSGDYWraKWqjZmaNiK44Wxcooyotfv5It+RU7hMQJzJa5YLXkbnWr++tuKwMwnG2+MTif/kUjRAaWEW0GYDSwLNMPLPFPUraKYpp+RokZjhStIDzjN6SIhqIucYQWlYWcUsLxvEoMaZKgkFdokDG6ri6bUFKVOocx2iE8h5DsUv/BEZ9qNQyjmHhAOJ4q0b6jJsYwfI0ZXSZK3sACk/Qvm55BzUutX0xhRNclErgbgCGjlGdPs80QEWlcbbbsvfuW2XzfDCX8kBf8t8fp5vsDYdMYvPy5/RW8efGVFWRsVpAskdYj3S3faguhSBhMDSnjUxrTBJK7gnqbWgFJOYYYFWseKZ0LoimI/yLOt+r04ZJTQZryGVGzmUwpqFU5RVrQJQvRPo2UD0EWI75nnZMfgfBtRGeIs614jyECOV5V9wGVj8X5usLO4kGZ+iNmb7C6S8R2byO8qljf/bWUDnI7oQm/WqT2uxELLGe+KSblFgmOk8obBE14eYkbq/9E8ztGUMZljcYy1hicoTVlrwvNVRgjY1wVJsipXlXq76HqlZi5J3Dx+j/X8VlEDBFBit7Rc8ze07wGHyvEOBZ4e6NU4hITbrWCoQhwxARhMYchTuKXFDH8gvAo9QYjq6D8rcDYTGlTOJeCwuVYIlGm6cg0UtszkTAwlWIEbEg4Ts2hscyuYlAVxHK0loOQznCongkcI3KbY/+QEiq2P0poksrnjL7micRUEu/hDBOZIL8jFsEE6o2ozUo9JpgQzUtkkrEZRRMjZ1iaMQ0PBCg3tLQu0tm4BTV3UU69YOskp5K35arxusiElqdo01ISNIFxJmQ0wZdISDtmN9I/MYOS6EaWHdLnBCwspGNI4j0mZ8hmzoHZzPrMbOa0ZrPTYGlImUAj4+bpj1ZM6rHmdKyJHORHdpPT+9YYuO55sMZ2Ph9rmhy3jjVN4b4Q8ch3yaUDRhvMf6hTlM8/S88jaRE3H21LU0+IYaGbdNKU1jWS7J5OyfpOg/E17WAgURKeKE4jXx9+UDt8v3am2fbVW+UmpsbI8+uM3GtgOp4f2B5wfdt0q3wz4Nzhm7pLboUTPMjdX8h3WaRFkEN59oyuRMfMji9Hu9zUnCxjnHy0/u9R+3TUDiM09sdNqA1cEICoG9Q2nWq8uV4DaltNqG2cDbW9y8WcCLYQCXRP4j7c+nA7f7jZuiT5QuHmXy7cJpTNIOd9cuuj7RLR5gZfLrlpaZ/RklQ6EtNwWnoSYVy2/VEe/CwPUlayZ9PjlJudj8/Y4mioOvbb/2V6IaveCAdH9kIOqLmvVWN05uZHq35OX702rLK7XjuO0+qybU30F3ZY97dwWLMjh80/L2tG9oUdtunarQfXA33V6331kr7aXnaf+lE9meB4yWBaGu671Ou/tHdd1k5g5MGwqawd265j2N2UtV7ddY2GstZsKmvrBURnZS1oKmu78OaHl5enQX9FdPbraBj6EWhyXAvYttPV149aZRw0+O1lb4jAIbfRx1UM+26YP6kGeDe1A6P5/C6T2+v9Tp6iP9w4tV1FnpzbxbD4QV+2vPjZJLj7Dw==</diagram><diagram id="91CLsxduplAA3CD-TjZB" name="Page-2">ldFPD4IgFADwT8OxTSUrr5nZ2tpaHqpTY4LKhj5DmtanT4dmzEtd2OPH4z3+IOznTShJmR2AMoEcizYIb5DjePNFO3bw1OC6noZUcqrJHiHiL9aj1euDU1YZiQpAKF6aGENRsFgZRqSE2kxLQJhdS5KyCUQxEVM9c6oyrSvXGn3HeJoNnW2rX8nJkNxDlREK9RfhAGFfAigd5Y3PRPd2w7tcg2WVyPnFWavj6X5z934YznSx7T9bPleQrFC/lm6D8WjtxPhfHLwB</diagram></mxfile>
\ No newline at end of file
diff --git a/docs/source/_static/README.md b/docs/source/_static/README.md
new file mode 100644
index 0000000..5372b4b
--- /dev/null
+++ b/docs/source/_static/README.md
@@ -0,0 +1,10 @@
+# Diagrams
+
+The following files in This directory are managed using [diagrams.net](https://diagrams.net):
+
+- `how-pygeoapi-works.png`: component architecture diagram using [C4](https://c4model.com) notation.
+
+To use in diagrams.net:
+
+- to export as a static image, use `File -> Export as -> PNG` and save to the
+  `/docs/sources/_static` directory and use/reference accordingly
diff --git a/docs/source/_static/how-pygeoapi-works.png b/docs/source/_static/how-pygeoapi-works.png
index 370c4ad..3bc94d4 100644
Binary files a/docs/source/_static/how-pygeoapi-works.png and b/docs/source/_static/how-pygeoapi-works.png differ
diff --git a/pygeoapi/templates/collections/index.html b/pygeoapi/templates/collections/index.html
index 0a43faa..5336df3 100644
--- a/pygeoapi/templates/collections/index.html
+++ b/pygeoapi/templates/collections/index.html
@@ -6,7 +6,7 @@
 {% block body %}
     <section id="collections">
       <h1>Collections in this service</h1>
-            <table class="table table-striped">
+            <table class="table table-striped table-bordered">
               <thead>
               <tr>
                 <th>{% trans %}Name{% endtrans %}</th>
diff --git a/pygeoapi/templates/collections/items/index.html b/pygeoapi/templates/collections/items/index.html
index bee2747..62e68f2 100644
--- a/pygeoapi/templates/collections/items/index.html
+++ b/pygeoapi/templates/collections/items/index.html
@@ -70,7 +70,7 @@
         </div>
       </div>
       <div class="col-sm-12 col-md-6">
-          <table class="table table-striped">
+          <table class="table table-striped table-bordered">
             <thead>
             <tr>
               {% if data.get('uri_field') %}
diff --git a/pygeoapi/templates/collections/items/item.html b/pygeoapi/templates/collections/items/item.html
index b6f7068..d9be0a6 100644
--- a/pygeoapi/templates/collections/items/item.html
+++ b/pygeoapi/templates/collections/items/item.html
@@ -69,7 +69,7 @@
           </div>
         </div>
         <div class="col-md-6 col-sm-12">
-            <table class="table table-striped">
+            <table class="table table-striped table-bordered">
               <thead>
               <tr>
                 <th>{% trans %}Property{% endtrans %}</th>
diff --git a/pygeoapi/templates/jobs/index.html b/pygeoapi/templates/jobs/index.html
index e014105..05c12d9 100644
--- a/pygeoapi/templates/jobs/index.html
+++ b/pygeoapi/templates/jobs/index.html
@@ -7,7 +7,7 @@
     <section id="jobs">
       <div class="row">
         <div class="col-md-12">
-          <table class="job-list table table-striped">
+          <table class="job-list table table-striped table-bordered">
             <caption>{% trans %}Jobs{% endtrans %}</caption>
             <thead>
               <tr>
diff --git a/pygeoapi/templates/processes/index.html b/pygeoapi/templates/processes/index.html
index d168545..8d5bd0b 100644
--- a/pygeoapi/templates/processes/index.html
+++ b/pygeoapi/templates/processes/index.html
@@ -8,7 +8,7 @@
       <h2>{% trans %}Processes in this service{% endtrans %}</h2>
       <div class="row">
         <div class="col-sm-12 col-md-6">
-          <table class="table table-striped">
+          <table class="table table-striped table-bordered">
             <thead>
               <tr>
                 <th>{% trans %}Name{% endtrans %}</th>
diff --git a/pygeoapi/templates/processes/process.html b/pygeoapi/templates/processes/process.html
index 317b74c..66d5607 100644
--- a/pygeoapi/templates/processes/process.html
+++ b/pygeoapi/templates/processes/process.html
@@ -16,7 +16,7 @@
       <meta itemprop="url" content="{{config.server.url}}/processes/{{data.id}}" />
       <div class="row">
         <div class="col-sm-12 col-md-12">
-          <table class="striped hoverable">
+          <table class="table table-striped table-bordered">
             <caption>{% trans %}Inputs{% endtrans %}</caption>
             <thead>
             <tr>
@@ -47,7 +47,7 @@
           </table>
         </div>
         <div class="col-sm-12 col-md-12">
-          <table class="striped hoverable">
+          <table class="table table-striped table-bordered">
             <caption>{% trans %}Outputs{% endtrans %}</caption>
             <thead>
             <tr>
diff --git a/pygeoapi/templates/stac/catalog.html b/pygeoapi/templates/stac/catalog.html
index 873bdb0..daf4b27 100644
--- a/pygeoapi/templates/stac/catalog.html
+++ b/pygeoapi/templates/stac/catalog.html
@@ -11,7 +11,7 @@
 
   <section id="links">
     <h2>{{ data['type'] }}: {{ data['path'] }}</h2>
-    <table class="table table-striped">
+    <table class="table table-striped table-bordered">
       <thead>
         <tr>
           <th>{% trans %}Name{% endtrans %}</th>
diff --git a/pygeoapi/templates/stac/collection.html b/pygeoapi/templates/stac/collection.html
index 1beda15..30037a3 100644
--- a/pygeoapi/templates/stac/collection.html
+++ b/pygeoapi/templates/stac/collection.html
@@ -11,7 +11,7 @@
 
     <section id="collections">
       <h2>Collections</h2>
-            <table class="table table-striped">
+            <table class="table table-striped table-bordered">
               <thead>
               <tr>
                 <th>{% trans %}Name{% endtrans %}</th>
diff --git a/pygeoapi/templates/stac/item.html b/pygeoapi/templates/stac/item.html
index 2dc20d1..f42525e 100644
--- a/pygeoapi/templates/stac/item.html
+++ b/pygeoapi/templates/stac/item.html
@@ -26,7 +26,7 @@
               <div id="items-map"></div>
               <div id="assets">
                 <h4>{% trans %}Assets{% endtrans %}</h4>
-                <table class="table table-striped">
+                <table class="table table-striped table-bordered">
                   <thead>
                     <tr>
                       <th>{% trans %}URL{% endtrans %}</th>
@@ -52,7 +52,7 @@
           </div>
         </div>
         <div class="col-md-6 col-sm-12">
-            <table class="table table-striped">
+            <table class="table table-striped table-bordered">
               <thead>
               <tr>
                 <th>{% trans %}Property{% endtrans %}</th>