diff --git a/aircox/templates/aircox/episode_detail.html b/aircox/templates/aircox/episode_detail.html
index abc06a9..8ad5be2 100644
--- a/aircox/templates/aircox/episode_detail.html
+++ b/aircox/templates/aircox/episode_detail.html
@@ -3,18 +3,6 @@
 {% load i18n aircox %}
 
 
-{% block top-nav-tools %}
-{% has_perm page page.program.change_permission_codename simple=True as can_edit %}
-{% if can_edit %}
-<a class="navbar-item" href="{% url 'episode-edit' page.pk %}" target="_self">
-    <span class="icon is-small">
-        <i class="fa fa-pen"></i>
-    </span>&nbsp;
-    <span>{% translate "Edit" %}</span>
-</a>
-{% endif %}
-{% endblock %}
-
 {% block content-container %}
 
 <a-episode :page="{title: &quot;{{ page.title }}&quot;, podcasts: {{ object.podcasts|json }}}">
diff --git a/aircox/templates/aircox/episode_form.html b/aircox/templates/aircox/episode_form.html
index e86f672..7a5191c 100644
--- a/aircox/templates/aircox/episode_form.html
+++ b/aircox/templates/aircox/episode_form.html
@@ -9,16 +9,11 @@
 {% block init-scripts %}
 {% endblock %}
 
-{% block top-nav-tools %}
-<a class="navbar-item" href="{% url 'episode-detail' object.slug %}" target="_self">
-    <span class="icon is-small">
-        <i class="fa fa-eye"></i>
-    </span>&nbsp;
-    <span>{% translate "View" %}</span>
-</a>
+{% block comments %}
 {% endblock %}
 
-{% block main %}
+{% block content-container %}
+<section class="container">
 <form method="post" enctype="multipart/form-data">{% csrf_token %}
     <table>
         {{ form.as_table }}
@@ -27,4 +22,5 @@
     <br/>
     <input type="submit" value="Update" class="button is-success">
 </form>
+</section>
 {% endblock %}
diff --git a/aircox/templates/aircox/page_detail.html b/aircox/templates/aircox/page_detail.html
index ebd69f6..f89158c 100644
--- a/aircox/templates/aircox/page_detail.html
+++ b/aircox/templates/aircox/page_detail.html
@@ -10,21 +10,6 @@ Context:
 - related_url: url to the full list of related_objects
 {% endcomment %}
 
-{% block top-nav-tools %}
-{% has_perm page "change" as can_edit %}
-{% if can_edit %}
-<a class="navbar-item" href="{{ page|admin_url:'change' }}"
-    target="new">
-    <span class="icon is-small">
-        <i class="fa fa-pen"></i>
-    </span>&nbsp;
-    <span>{% translate "Edit" %}</span>
-</a>
-{% endif %}
-{% endblock %}
-
-
-
 {% block breadcrumbs %}
 {% if parent %}
     {% include "./widgets/breadcrumbs.html" with page=parent %}
diff --git a/aircox/templates/aircox/program_form.html b/aircox/templates/aircox/program_form.html
index a2aaa4f..fc937c2 100644
--- a/aircox/templates/aircox/program_form.html
+++ b/aircox/templates/aircox/program_form.html
@@ -1,4 +1,4 @@
-{% extends "aircox/basepage_detail.html" %}
+{% extends "aircox/page_detail.html" %}
 {% load static i18n humanize honeypot aircox %}
 
 
@@ -9,16 +9,12 @@
 {% block init-scripts %}
 {% endblock %}
 
-{% block top-nav-tools %}
-<a class="navbar-item" href="{% url 'program-detail' object.slug %}" target="_self">
-    <span class="icon is-small">
-        <i class="fa fa-eye"></i>
-    </span>&nbsp;
-    <span>{% translate "View" %}</span>
-</a>
+{% block comments %}
 {% endblock %}
 
-{% block main %}
+{% block content-container %}
+<section class="container">
+<div>
 <form method="post" enctype="multipart/form-data">{% csrf_token %}
     <table>
         {{ form.as_table }}
@@ -27,4 +23,6 @@
     <br/>
     <input type="submit" value="Update" class="button is-success">
 </form>
+</div>
+</section>
 {% endblock %}