diff --git a/source/screens/demo/index.liquid b/source/screens/demo/index.liquid
index 0b7c221..1f19b26 100644
--- a/source/screens/demo/index.liquid
+++ b/source/screens/demo/index.liquid
@@ -9,8 +9,6 @@ tags:
{% assign pageClass = "h_full_view" -%}
{%- layout "hippie/full.liquid" %}
-{% block title %}Index{% endblock %}
-
{% block body %}
diff --git a/source/screens/demo/pages/blank.liquid b/source/screens/demo/pages/blank.liquid
new file mode 100644
index 0000000..b6914e5
--- /dev/null
+++ b/source/screens/demo/pages/blank.liquid
@@ -0,0 +1,10 @@
+---
+title: Blank
+---
+{% assign pageBase = "../../" -%}
+{% assign pageId = page.fileSlug -%}
+{%- layout "hippie/full.liquid" %}
+
+{% block body %}
+
+{% endblock %}
diff --git a/source/screens/demo/pages/blank.njk b/source/screens/demo/pages/blank.njk
deleted file mode 100644
index 3ff646f..0000000
--- a/source/screens/demo/pages/blank.njk
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Blank
----
-{% set pageBase = "../" %}
-{% set pageId = page.fileSlug %}
-{% set pageClass = "h_full_view" %}
-
-{% extends "demo/_default.njk" %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block head %}
-{{ super() }}
-{% endblock %}
-
-{% block body %}
-
-{% endblock %}
-
-{% block script %}
-{{ super() }}
-{% endblock %}
diff --git a/source/screens/demo/pages/default.liquid b/source/screens/demo/pages/default.liquid
index 026c6da..5da6a7c 100644
--- a/source/screens/demo/pages/default.liquid
+++ b/source/screens/demo/pages/default.liquid
@@ -1,5 +1,5 @@
---
-title: "Default"
+title: Default
---
{% assign pageBase = "../" -%}
{% assign pageId = page.fileSlug -%}
diff --git a/source/screens/demo/pages/maintenance.liquid b/source/screens/demo/pages/maintenance.liquid
index d713f9e..a4943f2 100644
--- a/source/screens/demo/pages/maintenance.liquid
+++ b/source/screens/demo/pages/maintenance.liquid
@@ -2,7 +2,7 @@
title: Maintenance
---
{% assign pageBase = "../../" -%}
-{% assign pageClass = "h_full_view" %}
+{% assign pageClass = "h_full_view" -%}
{%- layout "hippie/status.liquid" %}
{% block body %}
diff --git a/source/templates/hippie/full.liquid b/source/templates/hippie/full.liquid
index 7167a5f..89ba267 100644
--- a/source/templates/hippie/full.liquid
+++ b/source/templates/hippie/full.liquid
@@ -14,7 +14,7 @@
{% block head %}
{{- hippie.titlePrefix -}}
- {% block title %}{% endblock -%}
+ {% block title %}{{ title }}{% endblock -%}
{{ hippie.titlePostfix -}}
{% block meta -%}
diff --git a/source/templates/hippie/status.liquid b/source/templates/hippie/status.liquid
index 6189ca9..f2e0ce1 100644
--- a/source/templates/hippie/status.liquid
+++ b/source/templates/hippie/status.liquid
@@ -1,6 +1,6 @@
{% if pageClass %}
- {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%}
+{%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%}
{% endif -%}
{% if bodyClass %}
{%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%}
@@ -18,7 +18,8 @@
{% render "hippie/partials/meta.liquid" %}
{% endblock -%}
{% block links -%}
-
+
{% endblock -%}
{% endblock -%}