diff --git a/all_paw_care/pages/routes.py b/all_paw_care/pages/routes.py
index b5f14e9..95b36bb 100644
--- a/all_paw_care/pages/routes.py
+++ b/all_paw_care/pages/routes.py
@@ -1,17 +1,18 @@
 from all_paw_care.pages import pages 
+from all_paw_care.content import pages as site_pages
 
 from flask import render_template,url_for
 
 @pages.route('/')
 @pages.route('/home')
 def home():
-    return render_template("pages/index.html")
+    return render_template("pages/index.html", page=site_pages.home)
 
 @pages.route('/faq')
 def faq():
-    return render_template("pages/faq.html")
+    return render_template("pages/faq.html", page=site_pages.faqs)
 
 @pages.route('/services')
 def services():
-    return render_template("pages/services.html")
+    return render_template("pages/services.html", page=site_pages.services)
 
diff --git a/all_paw_care/templates/pages/faq.html b/all_paw_care/templates/pages/faq.html
index 1e38b81..897cb45 100644
--- a/all_paw_care/templates/pages/faq.html
+++ b/all_paw_care/templates/pages/faq.html
@@ -1,6 +1,6 @@
 {% extends "jinja/types/page.html" %}
 
-{% set title %}FAQ{% endset %}
+{% set title %}{{ page.get_title() }}{% endset %}
 
 {% block content %}
     <div class="row text-center mb-2">
@@ -9,20 +9,20 @@
         </h1>
     </div>
 
-    {% for faq in config.FAQS.items() %}
+    {% for faq in page.get_content() %}
         <div class="row">
             <div class="col-1">
             </div>
 
             <a class="btn btn-primary text-center" data-bs-toggle="collapse"
-                   href="#{{ faq[1][0] }}" role="button" aria-expanded="false"
-                    aria-controls="{{ faq[1][0] }}">
-                <h2>{{ faq[0] }}</h2>
+                   href="#{{ page.get_content()[faq]['tag'] }}" role="button" aria-expanded="false"
+                    aria-controls="{{ page.get_content()[faq]['tag'] }}">
+                <h2>{{ faq }}</h2>
             </a>
 
-            <div class="collapse" id="{{ faq[1][0] }}">
+            <div class="collapse" id="{{ page.get_content()[faq]['tag'] }}">
                 <div class="card card-body text-center">
-                    {{ faq[1][1] }}
+                    {{ page.get_content()[faq]['answer'] }}
                 </div>
             </div>
 
diff --git a/all_paw_care/templates/pages/index.html b/all_paw_care/templates/pages/index.html
index b693c69..0ab7527 100644
--- a/all_paw_care/templates/pages/index.html
+++ b/all_paw_care/templates/pages/index.html
@@ -1,25 +1,25 @@
 {% extends "jinja/types/page.html" %}
 
-{% set title %}About me{% endset %}
+{% set title %}{{ page.get_title() }}{% endset %}
 
 {% block content %}
     <div class="row text-center">
         <h1 class="text-primary display-1">
-            About me
+            {{ page.get_title() }}
         </h1>
     </div>
 
-    {%  for row in config.ABOUT_ME %}
+    {%  for row in page.get_content() %}
         <div class="row pb-3">
             <div class="col-8 text-center {{ loop.cycle('order-first','order-last') }}">
                 <p class="text-secondary lead">
-                    {{ row[1] }}
+                    {{ page.get_content()[row]['content'] }}
                 </p>
             </div>
             
             <div class="col-4 {{ loop.cycle('order-last','order-first') }}"> 
                 <picture>
-                    {% for img in row[0] %}
+                    {% for img in page.get_content()[row]['images'] %}
                         {% if not loop.last %}
                             <source srcset="{{ img }}"
                                     media="(max-width: {{ config.IMG_BREAKPOINTS[loop.index] }})" />
@@ -29,7 +29,7 @@
                         {% endif %}
                     {% endfor %}
 
-                    <img class="img-fluid" src="{{ row[0][1] }}">
+                    <img class="img-fluid" src="{{ page.get_content()[row]['images'][1] }}">
                 </picture>
             </div>
         </div>
diff --git a/all_paw_care/templates/pages/services.html b/all_paw_care/templates/pages/services.html
index 03ff11e..05da5c7 100644
--- a/all_paw_care/templates/pages/services.html
+++ b/all_paw_care/templates/pages/services.html
@@ -1,114 +1,66 @@
 {% extends "jinja/types/page.html" %}
 
-{% set title %}Services{% endset %}
+{% set title %}{{ page.get_title() }}{% endset %}
 
 {% block content %}
 <div class="row text-center pb-2">
     <h1 class="text-primary display-1">
-        Services & Pricing
+        {{ page.get_title() }}
     </h1>
 </div>
 
-<div class="row">
-    <h2 class="text-secondary display-2">
-        Primary services:
-    </h2>
-</div>
+<hr>
 
-<div class="row pt-2 pb-4">
-    {% for service in config.SERVICES.items() %}
-        <div class="col-4">
-            <div class="card">
-                <picture>
-                    {% for img in service[1][0] %}
-                        {% if not loop.last %}
-                            <source srcset="{{ img }}"
-                                    media="(max-width: {{ config.IMG_BREAKPOINTS[loop.index] }})" />
-                        {% else %}
-                            <source srcset="{{ img }}"
-                                    media="(min-width: {{ config.IMG_BREAKPOINTS[loop.index] }})" />
-                        {% endif %}
-                    {% endfor %}
+{% for section in page.get_content() %}
+    <div class="row text-center">
+        <h2 class="text-secondary display-3">
+            {{ section }}
+        </h2>
+    </div>
 
-                    <img class="img-fluid card-img-top"
-                         src="{{ service[1][0][1] }}">
-                </picture>
-                <div class="card-body">
-                    <h1 class="card-title text-center text-primary">{{ service[0] }}</h1>
+    <div class="row pt-2 pb-4">
+        {% for service in page.get_content()[section] %}
+            <div class="col-4">
+                <div class="card">
+                    <picture>
+                        {% for img in service['images'] %}
+                            {% if not loop.last %}
+                                <source srcset="{{ img }}"
+                                        media="(max-width: {{ config.IMG_BREAKPOINTS[loop.index] }})" />
+                            {% else %}
+                                <source srcset="{{ img }}"
+                                        media="(min-width: {{ config.IMG_BREAKPOINTS[loop.index] }})" />
+                            {% endif %}
+                        {% endfor %}
 
-                    <hr>
+                        <img class="img-fluid card-img-top"
+                             src="{{ service['images'][1] }}">
+                    </picture>
+                    <div class="card-body">
+                        <h1 class="card-title text-center text-primary">{{ service['title'] }}</h1>
 
-                    <h2 class="text-success text-center">
-                        {{ service[1][1] }}
-                    </h2>
+                        <hr>
 
-                    <hr class="invisible">
+                        <h2 class="text-success text-center">
+                            {{ service['price'] }}
+                        </h2>
 
-                    <p class="text-secondary">
-                        {{ service[1][2] }}
+                        <hr class="invisible">
 
-                        <ul>
-                            {% for included in service[1][3] %}
-                                <li>{{ included }}</li>    
-                            {% endfor %}
-                        </ul>
-                    </p>
+                        <p class="text-secondary">
+                            Service includes:
+                            <ul>
+                                {% for included in service['included'] %}
+                                    <li>{{ included }}</li>    
+                                {% endfor %}
+                            </ul>
+                        </p>
+                    </div>
                 </div>
             </div>
-        </div>
-    {% endfor %}
-</div>
-
-<div class="row">
-    <h2 class="text-secondary">
-        Add-on services:
-    </h2>
-</div>
-
-<div class="row pt-2 pb-4">
-    {% for service in config.SERVICES.items() %}
-        <div class="col-4">
-            <div class="card">
-                <picture>
-                    {% for img in service[1][0] %}
-                        {% if not loop.last %}
-                            <source srcset="{{ img }}"
-                                    media="(max-width: {{ config.IMG_BREAKPOINTS[loop.index] }})" />
-                        {% else %}
-                            <source srcset="{{ img }}"
-                                    media="(min-width: {{ config.IMG_BREAKPOINTS[loop.index] }})" />
-                        {% endif %}
-                    {% endfor %}
-
-                    <img class="img-fluid" class="card-img-top"
-                            src="{{ service[1][0][1] }}"
-                            alt="Woman walking dog">
-                </picture>
-                <div class="card-body">
-                    <h1 class="card-title text-center text-primary">{{ service[0] }}</h1>
-
-                    <hr>
-
-                    <h2 class="text-success text-center">
-                        {{ service[1][1] }}
-                    </h2>
-
-                    <hr class="invisible">
-
-                    <p class="text-secondary">
-                        {{ service[1][2] }}
-
-                        <ul>
-                            {% for included in service[1][3] %}
-                                <li>{{ included }}</li>    
-                            {% endfor %}
-                        </ul>
-                    </p>
-                </div>
-            </div>
-        </div>
-    {% endfor %}
-</div>
+        {% endfor %}
+    </div>
+{% endfor %}
 
 <div class="row">
     <div class="btn btn-primary">