diff --git a/ckanext/biskit/templates/home/about.html b/ckanext/biskit/templates/home/about.html
index 4b14614..5714999 100644
--- a/ckanext/biskit/templates/home/about.html
+++ b/ckanext/biskit/templates/home/about.html
@@ -6,7 +6,7 @@
 
 
           <div class="container-fluid top-desc">
-            <h2> Blood Information System for Krisis Intervention and Management.</h2>
+            <h2> Blood Information System for Crisis Intervention and Management.</h2>
           </div>
 
       {% block primary %}
@@ -27,4 +27,4 @@ <h2> Blood Information System for Krisis Intervention and Management.</h2>
 
       </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ckanext/biskit/templates/home/snippets/search.html b/ckanext/biskit/templates/home/snippets/search.html
index c270f5c..342dc1b 100644
--- a/ckanext/biskit/templates/home/snippets/search.html
+++ b/ckanext/biskit/templates/home/snippets/search.html
@@ -13,9 +13,8 @@
   </form>
   <div class="tags">
     <span>{{ _('Popular tags :') }}</span>
-    <a class="tag" href="#">Hospital</a><a class="tag" href="#">Supplier</a>
     {% for tag in tags %}
       <a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
     {% endfor %}
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ckanext/biskit/templates/package/base_form_page.html b/ckanext/biskit/templates/package/base_form_page.html
index 0dba9e8..c265e09 100644
--- a/ckanext/biskit/templates/package/base_form_page.html
+++ b/ckanext/biskit/templates/package/base_form_page.html
@@ -1,24 +1,16 @@
-{% extends "package/edit_base.html" %}
+{% ckan_extends %}
 
-
-{% block secondary_content %}
-  {% block info_module %}
-    <section class="module module-narrow module-shallow">
-      <h2 class="module-heading"><i class="fa fa-info-circle"></i> {{ _('What are datasets?') }}</h2>
-      <div class="module-content">
-        <p>
-          {% trans %}
-          A Dataset is a collection of data resources (such as files),
-          together with a description and other information, at a fixed URL.
-          Datasets are what users see when searching for data.
-          {% endtrans %}
-        </p>
-      </div>
-    </section>
-  {% endblock %}
-
-  {% block resources_module %}
-    {# TODO: Pass in a list of previously created resources and the current package dict #}
-    {% snippet "package/snippets/resources.html", pkg={}, action='new_resource' %}
-  {% endblock %}
+{% block info_module %}
+  <section class="module module-narrow module-shallow">
+    <h2 class="module-heading"><i class="fa fa-info-circle"></i> {{ _('What are datasets?') }}</h2>
+    <div class="module-content">
+      <p>
+        {% trans %}
+        A Dataset is a collection of data resources (such as files),
+        together with a description and other information, at a fixed URL.
+        Datasets are what users see when searching for data.
+        {% endtrans %}
+      </p>
+    </div>
+  </section>
 {% endblock %}