diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html
index 7737bfc1ae97091ac3af7abfcfd2faec0b7f5fe8..007d0e59929f7f58409137f0f39b58fb39f46596 100644
--- a/src/covid19/blueprints/application/templates/application/page_layout.html
+++ b/src/covid19/blueprints/application/templates/application/page_layout.html
@@ -1,58 +1,24 @@
-<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <link rel="shortcut icon" type="image/x-icon" href="/static/favicon.ico" />
- <link rel="stylesheet" href="/static/styles.css" />
- <title>{{page_info.title}}</title>
-</head>
-<body>
+{% extends "bootstrap/base.html" %}
+{% block title %}{{page_info.title}}{% endblock %}
- <header>
- <div class="container tw_padding">
- {% include 'application/fragments/fragment_navbar.html' %}
- </div>
- </header>
+{% block navbar %}
+{% include 'application/fragments/fragment_navbar.html' %}
+{% endblock %}
- <section>
- <div class="container tw_padding">
- {% include 'application/fragments/fragment_navtabs.html' %}
- </div>
- <div class="container">
- {% block navigation_navtabs %}{% endblock %}
- </div>
- <div class="container">
- {% block navigation_breadcrumb %}{% endblock %}
- </div>
- </section>
+{% block content %}
+ {{super()}}
+ {% include 'application/fragments/fragment_flashed_messages.html' %}
+{% endblock %}
- <main>
- <div class="container tw_padding">
- {% include 'application/fragments/fragment_flashed_messages.html' %}
- </div>
- <div class="container tw_padding">
- {% block main_container %}{% endblock %}
- </div>
- <div class="container-fluid tw_padding">
- {% block main_container_fluid %}{% endblock %}
- </div>
- </main>
+{% block styles %}
+{{super()}}
+<link rel="stylesheet"
+ href="{{url_for('.static', filename='styles.css')}}">
+{% endblock %}
- <section>
- <div class="container tw_padding">
- {% for error in errors %}
- <h4>{{ error }}</h4>
- {% endfor %}
- </div>
- </section>
+{% block scripts %}
+<script src="{{url_for('.static', filename='index.js')}}"></script>
+{{super()}}
+{% endblock %}
- <footer>
- <div class="container-fluid">
- {% block footer_container %}{% endblock %}
- </div>
- </footer>
-
- <script src="/static/index.js"></script>
-</body>
-</html>
\ No newline at end of file
+{% block html_attribs %} lang="en"{% endblock %}
\ No newline at end of file
diff --git a/src/covid19/blueprints/application/templates/application/page_layout_old.html b/src/covid19/blueprints/application/templates/application/page_layout_old.html
new file mode 100644
index 0000000000000000000000000000000000000000..7737bfc1ae97091ac3af7abfcfd2faec0b7f5fe8
--- /dev/null
+++ b/src/covid19/blueprints/application/templates/application/page_layout_old.html
@@ -0,0 +1,58 @@
+<!doctype html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <link rel="shortcut icon" type="image/x-icon" href="/static/favicon.ico" />
+ <link rel="stylesheet" href="/static/styles.css" />
+ <title>{{page_info.title}}</title>
+</head>
+<body>
+
+ <header>
+ <div class="container tw_padding">
+ {% include 'application/fragments/fragment_navbar.html' %}
+ </div>
+ </header>
+
+ <section>
+ <div class="container tw_padding">
+ {% include 'application/fragments/fragment_navtabs.html' %}
+ </div>
+ <div class="container">
+ {% block navigation_navtabs %}{% endblock %}
+ </div>
+ <div class="container">
+ {% block navigation_breadcrumb %}{% endblock %}
+ </div>
+ </section>
+
+ <main>
+ <div class="container tw_padding">
+ {% include 'application/fragments/fragment_flashed_messages.html' %}
+ </div>
+ <div class="container tw_padding">
+ {% block main_container %}{% endblock %}
+ </div>
+ <div class="container-fluid tw_padding">
+ {% block main_container_fluid %}{% endblock %}
+ </div>
+ </main>
+
+ <section>
+ <div class="container tw_padding">
+ {% for error in errors %}
+ <h4>{{ error }}</h4>
+ {% endfor %}
+ </div>
+ </section>
+
+ <footer>
+ <div class="container-fluid">
+ {% block footer_container %}{% endblock %}
+ </div>
+ </footer>
+
+ <script src="/static/index.js"></script>
+</body>
+</html>
\ No newline at end of file