From this
To this
and This
Also makes adding headers across the site actually work as new templates are based off of base_template.html 😃