diff --git a/apis_core/apis_entities/templates/apis_entities/edit_generic.html b/apis_core/apis_entities/templates/apis_entities/edit_generic.html
index 9c3414a0c..b03db94b9 100644
--- a/apis_core/apis_entities/templates/apis_entities/edit_generic.html
+++ b/apis_core/apis_entities/templates/apis_entities/edit_generic.html
@@ -1,5 +1,7 @@
 {% extends basetemplate %}
 {% load static %}
+{% load django_tables2 %}
+{% load crispy_forms_tags %}
 
 {% block scriptHeader %}
   {{ block.super }}
@@ -10,221 +12,182 @@
 
 {% endblock %}
 
-{% block Titel %}Create a {{ entity_type|title }}{% endblock %}
-
-{% load static %}
-
 {% block content %}
-  {% load django_tables2 %}
+  <div class="container-fluid">
+    <div class="card">
 
-  {% if instance %}
-    <div class="container-fluid">
-      <div class="card">
+      {% block card-header %}
         <div class="card-header" style="text-align: center;">
-          <h1>
-            <a href="{{ instance.get_listview_url }}">
-              <small>{{ entity_type }}s</small>
-            </a>
-            <strong>{{ instance }}</strong> <a href="{{ instance.get_absolute_url }}">
-              <span class="material-symbols-outlined">visibility</span>
-            </a>
-            <a href="/entity/{{ instance.id }}">
-              <span class="material-symbols-outlined">database</span>
-            </a>
-          </h1>
-        </div>
-        <div class="card-body">
-          <div class="row">
-            <div class="col-md-5">
-            {% endif %}
-
-            {% load crispy_forms_tags %}
-            <div class="card">
-              <div class="card-header">
-
-                {% if instance %}
-                  <h3>
-                    <small>Edit the Entity</small>
-                  </h3>
-                {% else %}
-                  <h2>
-                    <small>create new object type:</small> <strong>{{ entity_type|title }}</strong>
-                  </h2>
-                {% endif %}
 
-              </div>
-              <div class="card-body">
-                <form action="" method="post">
-
-                  {% if apis_bibsonomy %}
-                    <button hidden=True class="bibsonomy-anker-hidden" data-bibs-contenttype={{ entity_type }} data-bibs-object_pk={{ instance.pk }} data-bibs-form-elements="{{ apis_bibsonomy }}">Ref
-                    </button>
-                  {% endif %}
-
-                  {% crispy form %}
-
-                  {% block linkedOpenData %}
+          {% block card-header-content %}
+            <h1>
+              <a href="{{ instance.get_listview_url }}">
+                <small>{{ entity_type }}s</small>
+              </a>
+              <strong>{{ instance }}</strong> <a href="{{ instance.get_absolute_url }}">
+                <span class="material-symbols-outlined">visibility</span>
+              </a>
+              <a href="/entity/{{ instance.id }}">
+                <span class="material-symbols-outlined">database</span>
+              </a>
+            </h1>
+          {% endblock card-header-content %}
 
-                    {% if object_lod %}
-                      <div class="card card-default">
-                        <div class="card-header" role="tab" id="headingSix">
-                          <h4 class="card-title">
-                            <a role="button"
-                               data-toggle="collapse"
-                               data-parent="#accordion"
-                               href="#collapseOne3"
-                               aria-expanded="false"
-                               aria-controls="collapseOne3">Linked Open Data</a>
-                          </h4>
-                        </div>
-                        <div id="collapseOne3"
-                             class="card-collapse collapse"
-                             role="tabcard"
-                             aria-labelledby="headingSix">
-                          <div id="tab_Revisions" class="card-body">
-                            <p>
-                              {% for lod in object_lod %}
-
-                                {% if forloop.last %}
-                                  <a href="{{ lod.uri }}">{{ lod.uri }}</a>
-                                {% else %}
-                                  <a href="{{ lod.uri }}">{{ lod.uri }}</a>
-                                  <br />
-                                {% endif %}
-
-                              {% endfor %}
-                            </p>
-                          </div>
-                        </div>
-                      </div>
-                    {% endif %}
+        </div>
+      {% endblock card-header %}
 
-                  {% endblock %}
+      {% block card-body %}
+        <div class="card-body">
 
-                  {% block editbuttons %}
-                    <div class="mt-2">
+          {% block card-body-content %}
+            <div class="row">
+              <div class="col-md-5">
+                <div class="card">
+                  <div class="card-header">
+                    <h3>
+                      <small>Edit the Entity</small>
+                    </h3>
+                  </div>
+                  <div class="card-body">
+                    <form action="" method="post">
 
-                      {% if instance %}
-                        <input class="btn btn-primary" type="submit" value="modify" />
-                        <button class="compare_tooltip btn btn-default"
-                                data-tooltip='{"app":"apis_entities","kind":"{{ entity_type|lower }}","pk":"{{ instance.pk }}"}'>
-                          Revisions
+                      {% if apis_bibsonomy %}
+                        <button hidden=True class="bibsonomy-anker-hidden" data-bibs-contenttype={{ entity_type }} data-bibs-object_pk={{ instance.pk }} data-bibs-form-elements="{{ apis_bibsonomy }}">Ref
                         </button>
-                        <a class ="btn btn-danger btn-primary" href="delete">Delete</a>
-                        <a class="btn btn-success"
-                           href="{% url 'apis:apis_entities:generic_entities_create_view' entity_type %}">Create new {{ entity_type|title }}</a>
-                      {% else %}
-                        <input class="btn btn-primary" type="submit" value="create" />
                       {% endif %}
 
-                    </div>
-                  {% endblock editbuttons %}
-                </form>
-              </div>
-
-              {% if instance %}
-              </div>
-            </div>
-          {% endif %}
+                      {% crispy form %}
 
-          {% if instance %}
-            <div class="col-md-7">
-              <div class="card card-default">
-                <div class="card-header">
-                  <h3>
-                    <small> the Entity is related to
-                    </h3>
-                  </div>
-                  <div class="card-body">
-                    <div id="accordion" role="tablist" aria-multiselectable="true">
+                      {% block linkedOpenData %}
 
-                      {% block additional_accordion %}
-                        <div class="panel panel-default">
-                          <div class="panel-heading" role="tab" id="headingOne">
-                            <h4 class="panel-title">
-                              <a role="button"
-                                 data-toggle="collapse"
-                                 data-parent="#accordion"
-                                 href="#collapseOne"
-                                 aria-expanded="true"
-                                 aria-controls="collapseOne">Merge with</a>
-                            </h4>
-                          </div>
-                          <div id="collapseOne"
-                               class="panel-collapse collapse in"
-                               role="tabpanel"
-                               aria-labelledby="headingOne">
-                            <div id="tab_merge_with" class="panel-body">
-                              {% load crispy_forms_tags %}
-                              {% crispy form_merge_with  form_merge_with.helper %}
+                        {% if object_lod %}
+                          <div class="card card-default">
+                            <div class="card-header" role="tab" id="headingSix">
+                              <h4 class="card-title">
+                                <a role="button"
+                                   data-toggle="collapse"
+                                   data-parent="#accordion"
+                                   href="#collapseOne3"
+                                   aria-expanded="false"
+                                   aria-controls="collapseOne3">Linked Open Data</a>
+                              </h4>
+                            </div>
+                            <div id="collapseOne3"
+                                 class="card-collapse collapse"
+                                 role="tabcard"
+                                 aria-labelledby="headingSix">
+                              <div id="tab_Revisions" class="card-body">
+                                <p>
+                                  {% for lod in object_lod %}
+
+                                    {% if forloop.last %}
+                                      <a href="{{ lod.uri }}">{{ lod.uri }}</a>
+                                    {% else %}
+                                      <a href="{{ lod.uri }}">{{ lod.uri }}</a>
+                                      <br />
+                                    {% endif %}
+
+                                  {% endfor %}
+                                </p>
+                              </div>
                             </div>
                           </div>
+                        {% endif %}
+
+                      {% endblock %}
+
+                      {% block editbuttons %}
+                        <div class="mt-2">
+                          <input class="btn btn-primary" type="submit" value="modify" />
+                          <button class="compare_tooltip btn btn-default"
+                                  data-tooltip='{"app":"apis_entities","kind":"{{ entity_type|lower }}","pk":"{{ instance.pk }}"}'>
+                            Revisions
+                          </button>
+                          <a class ="btn btn-danger btn-primary" href="delete">Delete</a>
+                          <a class="btn btn-success"
+                             href="{% url 'apis:apis_entities:generic_entities_create_view' entity_type %}">Create new {{ entity_type|title }}</a>
                         </div>
-                        <hr />
-                      {% endblock additional_accordion %}
+                      {% endblock editbuttons %}
 
-                      {% block relations %}
-                        {% for obj in right_card %}
-                          <div class="card card-default">
-                            <div class="card-header" role="tab" id="heading{{ forloop.counter }}">
-                              <h4 class="card-title">
+                    </form>
+                  </div>
+                </div>
+              </div>
+              <div class="col-md-7">
+                <div class="card card-default">
+                  <div class="card-header">
+                    <h3>
+                      <small> the Entity is related to
+                      </h3>
+                    </div>
+                    <div class="card-body">
+                      <div id="accordion" role="tablist" aria-multiselectable="true">
+
+                        {% block additional_accordion %}
+                          <div class="panel panel-default">
+                            <div class="panel-heading" role="tab" id="headingOne">
+                              <h4 class="panel-title">
                                 <a role="button"
                                    data-toggle="collapse"
                                    data-parent="#accordion"
-                                   href="#collapse{{ forloop.counter }}"
+                                   href="#collapseOne"
                                    aria-expanded="true"
-                                   aria-controls="collapse{{ forloop.counter }}">{{ obj.0 }}</a>
+                                   aria-controls="collapseOne">Merge with</a>
                               </h4>
                             </div>
-                            <div id="collapse{{ forloop.counter }}" class="card-collapse collapse 
-                              {% if obj.3 %}in{% endif %}
-                               " role="tabcard" aria-labelledby="heading{{ forloop.counter }}">
-                              <div id="tab_{{ obj.2 }}" class="card-body">{% render_table obj.1 %}</div>
+                            <div id="collapseOne"
+                                 class="panel-collapse collapse in"
+                                 role="tabpanel"
+                                 aria-labelledby="headingOne">
+                              <div id="tab_merge_with" class="panel-body">
+                                {% load crispy_forms_tags %}
+                                {% crispy form_merge_with  form_merge_with.helper %}
+                              </div>
                             </div>
                           </div>
-                        {% endfor %}
-                      {% endblock relations %}
+                          <hr />
+                        {% endblock additional_accordion %}
+
+                        {% block relations %}
+                          {% for obj in right_card %}
+                            <div class="card card-default">
+                              <div class="card-header" role="tab" id="heading{{ forloop.counter }}">
+                                <h4 class="card-title">
+                                  <a role="button"
+                                     data-toggle="collapse"
+                                     data-parent="#accordion"
+                                     href="#collapse{{ forloop.counter }}"
+                                     aria-expanded="true"
+                                     aria-controls="collapse{{ forloop.counter }}">{{ obj.0 }}</a>
+                                </h4>
+                              </div>
+                              <div id="collapse{{ forloop.counter }}" class="card-collapse collapse 
+                                {% if obj.3 %}in{% endif %}
+                                 " role="tabcard" aria-labelledby="heading{{ forloop.counter }}">
+                                <div id="tab_{{ obj.2 }}" class="card-body">{% render_table obj.1 %}</div>
+                              </div>
+                            </div>
+                          {% endfor %}
+                        {% endblock relations %}
 
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-            {% endif %}
-
-            {% if instance %}
             </div>
-          </div>
-        {% endif %}
+          {% endblock card-body-content %}
 
-        {% if object_texts %}
-          <div class="row">
-            <div class="col-md-12">
-
-              {% if ann_proj_form %}
-                <div class="card card-default">{% crispy ann_proj_form ann_proj_form.helper %}</div>
-              {% endif %}
-
-              {% for txt in object_texts %}
-                <div class="card card-default">
-                  <div class="card-body">
-                    <div class="txt {{ txt.kind|slugify }}" id="htxt_{{ txt.id }}">{{ txt.text|safe }}</div>
-                    <div class="agreement" id="agrm_{{ txt.id }}"></div>
-                  </div>
-                </div>
-              {% endfor %}
-            </div>
-          </div>
         </div>
-      {% endif %}
-
-      {% load crispy_forms_tags %}
-    {% endblock %}
+      {% endblock card-body %}
 
-    {% block scripts %}
-      {{ block.super }}
+    </div>
+  </div>
+{% endblock %}
 
-      {% if instance %}
-        <script type="text/javascript">
+{% block scripts %}
+  {{ block.super }}
+  <script type="text/javascript">
     function GetFormAjax(FormName , ObjectID , ButtonText) {
         function add_form(data) {
             // update our tooltip content with our returned data and cache it
@@ -300,8 +263,8 @@ <h4 class="card-title">
             }
         );
     }
-        </script>
-        <script type="text/javascript">
+  </script>
+  <script type="text/javascript">
     function EntityRelationForm_response(response){
 
         console.log("apis_core/apis_entities/templates/apis_entities/edit_generic.html:EntityRelationForm_response")
@@ -334,8 +297,8 @@ <h4 class="card-title">
         };
         unbind_compare_forms();
     }
-        </script>
-        <script type="text/javascript">
+  </script>
+  <script type="text/javascript">
     function HighlForm_response(response){
         if (response.test == false) {
             $.ApisHigh.tt_instance.content(response.form);
@@ -352,8 +315,8 @@ <h4 class="card-title">
              initiate_compare_tooltip();
         }
     }
-        </script>
-        <script type="text/javascript">
+  </script>
+  <script type="text/javascript">
     function PAddRelation_response(response){
         if (response.test == false) {
             $.ApisHigh.tt_instance.content(response.form);
@@ -366,8 +329,8 @@ <h4 class="card-title">
              $('mark.highlight').on("click", highlight_detail)
         }
     }
-        </script>
-        <script type='text/javascript'>
+  </script>
+  <script type='text/javascript'>
     function DeleteTempEntity(pk, kind, app_name=false) {
         if (app_name){
             var url = '/apis/api/'+app_name+'/'+kind+'/'+pk.toString()
@@ -391,14 +354,14 @@ <h4 class="card-title">
             }
         })
     }
-        </script>
-        <script type='text/javascript'>
+  </script>
+  <script type='text/javascript'>
     function DeleteAnnTempEntity(an_pk, rel_class, rel_pk, app_name) {
         DeleteTempEntity(an_pk,"HLAnnotation");
         DeleteTempEntity(rel_pk, rel_class, app_name);
     };
-        </script>
-        <script type="text/javascript">
+  </script>
+  <script type="text/javascript">
  function activate_editing(){
         {% for obj in right_card %}
         GetFormAjax("{{obj.2}}");
@@ -411,9 +374,6 @@ <h4 class="card-title">
     $('.reledit').addClass("disabled");
     $('.reledit').prop("disabled", true);
  };
-{% endif %}
-{% if instance %}
 activate_editing();
-{% endif %}
-        </script>
-      {% endblock %}
+  </script>
+{% endblock %}