diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/detail_generic.html b/apis_core/apis_entities/templates/apis_entities/detail_views/detail_generic.html
index 58f934852..2470ac617 100644
--- a/apis_core/apis_entities/templates/apis_entities/detail_views/detail_generic.html
+++ b/apis_core/apis_entities/templates/apis_entities/detail_views/detail_generic.html
@@ -106,10 +106,10 @@ <h3>
                   </a>
                 </h3>
               </div>
-              <div class="card-body">
+              <div class="card-body p-0">
 
                 {% block info-table %}
-                  <table class="table table-bordered table-hover">
+                  <table class="table table-hover">
                     <tr>
                       <th>Titel</th>
                       <td>{{ object.name }}</td>
@@ -174,7 +174,7 @@ <h3>
                   {% endblock info-table %}
 
                   {% block info-metadata %}
-                    <table class="table table-bordered table-hover">
+                    <table class="table table-hover">
                       <tr>
                         <th>Collection(s)</th>
                         <td>
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 b1d609a6e..0cd75a5e7 100644
--- a/apis_core/apis_entities/templates/apis_entities/edit_generic.html
+++ b/apis_core/apis_entities/templates/apis_entities/edit_generic.html
@@ -68,65 +68,48 @@ <h2>
                     </button>
                   {% endif %}
 
-                  <div class="card card-default">
-                    {% crispy form %}
-                    <div class="card-header" role="tab" id="headingFour">
-                      <h4 class="card-title">
-                        <a class="collapsed"
-                           role="button"
-                           data-toggle="collapse"
-                           data-parent="#accordion"
-                           href="#collapseFour"
-                           aria-expanded="false"
-                           aria-controls="collapseFour">Texts</a>
-                      </h4>
-                    </div>
-                    <div id="collapseFour"
-                         class="card-collapse collapse"
-                         role="tabcard"
-                         aria-labelledby="headingFour">
-                      <div class="card-body"></div>
-                    </div>
-
-                    {% block linkedOpenData %}
-
-                      {% 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>
+                  {% crispy form %}
+
+                  {% block linkedOpenData %}
+
+                    {% 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>
-                      {% endif %}
+                      </div>
+                    {% endif %}
 
-                    {% endblock %}
+                  {% endblock %}
 
-                    {% block editbuttons %}
+                  {% block editbuttons %}
+                    <div class="mt-2">
 
                       {% if instance %}
                         <input class="btn btn-primary" type="submit" value="modify" />
@@ -141,9 +124,9 @@ <h4 class="card-title">
                         <input class="btn btn-primary" type="submit" value="create" />
                       {% endif %}
 
-                    {% endblock editbuttons %}
+                    </div>
+                  {% endblock editbuttons %}
 
-                  </div>
                 </form>
               </div>
 
@@ -161,10 +144,7 @@ <h3>
                     </h3>
                   </div>
                   <div class="card-body">
-                    <div class="card"
-                         id="accordion"
-                         role="tablist"
-                         aria-multiselectable="true">
+                    <div id="accordion" role="tablist" aria-multiselectable="true">
 
                       {% block additional_accordion %}
                         <div class="panel panel-default">