diff --git a/components/common/detail-view-toolbar.vue b/components/common/detail-view-toolbar.vue
new file mode 100644
index 0000000..0ea99e6
--- /dev/null
+++ b/components/common/detail-view-toolbar.vue
@@ -0,0 +1,94 @@
+<script>
+export default {
+  props: {
+    elementPath: {
+      required: true,
+      type: Array
+    },
+    elementUrn: {
+      required: true,
+      type: String
+    },
+    elementIsDeletable: {
+      required: true,
+      type: Boolean
+    },
+    elementIsEditable: {
+      required: true,
+      type: Boolean
+    },
+    activateNavigation: {
+      required: true,
+      type: Boolean
+    }
+  },
+  methods: {
+    getRightButtonClass () {
+      return {
+        'right-button-marked': this.selectedElementPathType === 'URN',
+        'right-button': this.selectedElementPathType !== 'URN'
+      }
+    },
+    getBreadCrumbItemColor (disabled) {
+      return {
+        'breadcrumb-item-disabled': disabled,
+        'breadcrumb-item-activated': !disabled
+      }
+    }
+  }
+}
+</script>
+
+<template>
+  <v-toolbar>
+    <v-toolbar-title>
+      <v-container class="text-center">
+        <v-row no-gutters>
+          <v-col>
+            <v-breadcrumbs :items="elementPath">
+              <template #item="{ item }">
+                <v-breadcrumbs-item
+                  link
+                  :disabled="item.urn === elementUrn || !activateNavigation"
+                  @click="$emit('showDetailViewDialog', item.urn)"
+                >
+                  <span :class="getBreadCrumbItemColor(item.urn === elementUrn || !activateNavigation)">
+                    {{ item.designation.toUpperCase() }}
+                  </span>
+                </v-breadcrumbs-item>
+              </template>
+            </v-breadcrumbs>
+          </v-col>
+        </v-row>
+      </v-container>
+    </v-toolbar-title>
+    <v-spacer />
+    <v-btn
+      v-if="elementIsEditable"
+      icon
+      color="primary"
+      @click="$emit('editElement')"
+    >
+      <v-icon>mdi-pencil</v-icon>
+    </v-btn>
+    <v-btn
+      v-if="elementIsDeletable"
+      icon
+      @click="$emit('deleteElement')"
+    >
+      <v-icon>mdi-delete</v-icon>
+    </v-btn>
+  </v-toolbar>
+</template>
+
+<style scoped>
+.breadcrumb-item-disabled {
+  color: #3d3f3f;
+}
+
+.breadcrumb-item-activated {
+  color: #0080c8;
+  cursor: pointer;
+}
+
+</style>
diff --git a/components/item/meta-data-card.vue b/components/item/meta-data-card.vue
index 86c2e52..33f9a6d 100644
--- a/components/item/meta-data-card.vue
+++ b/components/item/meta-data-card.vue
@@ -9,7 +9,7 @@ export default {
 
 <template>
   <v-card
-    class="meta-data-card d-flex align-left justify-center"
+    class="meta-data-card d-flex align-left justify-center ma-0 pa-ß"
   >
     <card>
       <v-list-item two-line>
@@ -22,7 +22,7 @@ export default {
   </v-card>
 </template>
 
-<style>
+<style scoped>
 
 .meta-data-card {
   border-radius: 75px;
diff --git a/components/item/meta-data.vue b/components/item/meta-data.vue
index 0ee4b67..f628cdf 100644
--- a/components/item/meta-data.vue
+++ b/components/item/meta-data.vue
@@ -1,6 +1,6 @@
 <template>
-  <v-container>
-    <v-row dense>
+  <v-container class="meta-data-container" fluid>
+    <v-row class="meta-data-row" dense>
       <v-col>
         <MetaDataCard
           :title="data.elementType.toUpperCase()"
@@ -106,7 +106,12 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
+
+.meta-data-container {
+  padding-inline: 0;
+}
+
 .meta-data-card {
   border-radius: 75px;
   elevation: level;
diff --git a/components/views/data-element-detail-view.vue b/components/views/data-element-detail-view.vue
index 1785228..edf6d88 100644
--- a/components/views/data-element-detail-view.vue
+++ b/components/views/data-element-detail-view.vue
@@ -15,171 +15,127 @@
       </v-row>
     </v-container>
   </div>
-  <div v-else>
-    <div v-if="dataElement !== undefined">
-      <data-element-dialog
-        :urn="urn"
-        :show="dialog"
-        @save="$emit('saveSuccess', $event); fetchDataElementDetails(); fetchElementPath()"
-        @saveFailure="$emit('saveFailure', $event)"
-        @dialogClosed="dialog = false"
+  <div class="detail-view-container" v-else>
+    <data-element-dialog
+      :urn="urn"
+      :show="dialog"
+      @save="$emit('saveSuccess', $event); fetchDataElementDetails(); fetchElementPath()"
+      @saveFailure="$emit('saveFailure', $event)"
+      @dialogClosed="dialog = false"
+    />
+    <v-card
+      v-if="!hidePath"
+      color="grey lighten-4 ma-0 pa-0"
+      flat
+    >
+      <detail-view-toolbar
+        :element-path="elementPathInTree"
+        :element-urn="urn"
+        :activate-navigation="activatePathNavigation"
+        :element-is-deletable="deletable"
+        :element-is-editable="editable"
+        @showDetailViewDialog="showDetailViewDialog($event)"
+        @editElement="editDataElement"
+        @deleteElement="deleteDataElement"
       />
-      <v-card
-        v-if="!hidePath"
-        class="detailViewCard"
-        color="grey lighten-4"
-        flat
-      >
-        <!-- Namespace Toolbar TODO: Check of this could be outsourced ...-->
-        <v-toolbar>
-          <v-toolbar-title>
-            <v-container class="text-center">
-              <v-row no-gutters>
-                <v-col v-for="item in elementPathInTree" :key="item.urn">
-                  <v-icon v-if="!item.urn.includes('namespace')">
-                    mdi-slash-forward
-                  </v-icon>
-                  <v-btn
-                    width="130"
-                    class="designationButton"
-                    color="grey lighten-4"
-                    rounded
-                    :disabled="!activatePathNavigation"
-                    @click="showDetailViewDialog(item.urn)"
-                  >
-                    <div
-                      v-if="item.urn === urn"
-                      style="text-align: center; width: 100%; white-space: normal;"
-                    >
-                      {{ item.designation }}
-                    </div>
-                    <a
-                      v-if="item.urn !== urn"
-                      style="text-align: center; width: 100%; white-space: normal;"
-                    >
-                      {{ item.designation }}
-                    </a>
-                  </v-btn>
-                </v-col>
-              </v-row>
-            </v-container>
-          </v-toolbar-title>
-          <v-spacer />
-          <v-btn
-            v-if="editable"
-            icon
-            color="primary"
-            @click="editDataElement"
-          >
-            <v-icon>mdi-pencil</v-icon>
-          </v-btn>
-          <v-btn
-            v-if="deletable"
-            icon
-            @click="deleteDataElement"
-          >
-            <v-icon>mdi-delete</v-icon>
-          </v-btn>
-        </v-toolbar>
-      </v-card>
-      <v-card outlined color="transparent" class="ma-0 pa-0">
-        <MetaData
-          :type="'DATAELEMENT'"
-          :data="dataElement.identification"
-        />
-      </v-card>
-      <v-card v-if="hidePath" class="detailViewCard">
-        <v-list>
-          <v-subheader>
-            {{ $t('global.paths') }}
-            <div class="choose-button-wrapper">
-              <button
-                :class="getLeftButtonClass()"
-                @click="selectedElementPathType = 'DESIGNATION'"
-              >
-                {{ $t('global.designation') }}
-              </button>
-              <button
-                :class="getRightButtonClass()"
-                @click="selectedElementPathType = 'URN'"
-              >
-                {{ $t('global.urn') }}
-              </button>
-            </div>
-          </v-subheader>
-          <v-list-item>
-            <v-list-item-content>
-              <paths-table :paths="allElementPathsAsString" />
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
-      </v-card>
-      <v-card class="detailViewCard">
-        <v-list>
-          <v-subheader>{{ $t('global.definitions') }}</v-subheader>
-          <v-list-item>
-            <v-list-item-content>
-              <definition-table :definitions="dataElement.definitions" />
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
-      </v-card>
-      <v-card class="detailViewCard">
-        <v-list>
-          <v-subheader>{{ $t('global.valueDomain') }} : {{ dataElement.valueDomainUrn }}</v-subheader>
-          <v-list-item>
-            <v-list-item-content>
-              <value-domain :urn="dataElement.identification.urn" />
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
-      </v-card>
-      <v-card class="detailViewCard">
-        <v-list v-if="dataElement.slots.length > 0">
-          <v-subheader>{{ $t('global.slots') }}</v-subheader>
-          <v-list-item>
-            <v-list-item-content>
-              <slot-table :slots="dataElement.slots" />
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
-      </v-card>
-      <v-card class="detailViewCard">
-        <v-list v-if="dataElement.relations.length > 0">
-          <v-subheader>{{ $t('global.relations') }}</v-subheader>
-          <v-list-item>
-            <v-list-item-content>
-              <relation-table
-                :relations="dataElement.relations"
-                :detail-view-available="relationDetailViewAvailable"
-              />
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
-      </v-card>
-      <v-card class="detailViewCard">
-        <v-list v-if="dataElement.conceptAssociations.length > 0">
-          <v-subheader>{{ $t('global.conceptAssociations') }}</v-subheader>
-          <v-list-item>
-            <v-list-item-content>
-              <concept-association-table :associations="dataElement.conceptAssociations" />
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
-      </v-card>
-      <v-btn
-        v-if="showJumpToElementButton"
-        class="d-block mr-0 ml-auto"
-        color="primary"
-        rounded
-        @click="dialog.elementType = 'NAMESPACE'; dialog.showNamespace = true"
-      >
-        {{ $t('global.button.showInTreeView') }}
-        <v-icon dark>
-          mdi-arrow-right-circle
-        </v-icon>
-      </v-btn>
-    </div>
+    </v-card>
+    <v-card outlined color="transparent" class="ma-0 pa-0">
+      <MetaData
+        :type="'DATAELEMENT'"
+        :data="dataElement.identification"
+      />
+    </v-card>
+    <v-card v-if="hidePath" class="detailViewCard">
+      <v-list>
+        <v-subheader>
+          {{ $t('global.paths') }}
+          <div class="choose-button-wrapper">
+            <button
+              :class="getLeftButtonClass()"
+              @click="selectedElementPathType = 'DESIGNATION'"
+            >
+              {{ $t('global.designation') }}
+            </button>
+            <button
+              :class="getRightButtonClass()"
+              @click="selectedElementPathType = 'URN'"
+            >
+              {{ $t('global.urn') }}
+            </button>
+          </div>
+        </v-subheader>
+        <v-list-item>
+          <v-list-item-content>
+            <paths-table :paths="allElementPathsAsString" />
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-card>
+    <v-card class="detailViewCard">
+      <v-list>
+        <v-subheader>{{ $t('global.definitions') }}</v-subheader>
+        <v-list-item>
+          <v-list-item-content>
+            <definition-table :definitions="dataElement.definitions" />
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-card>
+    <v-card class="detailViewCard">
+      <v-list>
+        <v-subheader>{{ $t('global.valueDomain') }} : {{ dataElement.valueDomainUrn }}</v-subheader>
+        <v-list-item>
+          <v-list-item-content>
+            <value-domain :urn="dataElement.identification.urn" />
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-card>
+    <v-card class="detailViewCard">
+      <v-list v-if="dataElement.slots.length > 0">
+        <v-subheader>{{ $t('global.slots') }}</v-subheader>
+        <v-list-item>
+          <v-list-item-content>
+            <slot-table :slots="dataElement.slots" />
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-card>
+    <v-card class="detailViewCard">
+      <v-list v-if="dataElement.relations.length > 0">
+        <v-subheader>{{ $t('global.relations') }}</v-subheader>
+        <v-list-item>
+          <v-list-item-content>
+            <relation-table
+              :relations="dataElement.relations"
+              :detail-view-available="relationDetailViewAvailable"
+            />
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-card>
+    <v-card class="detailViewCard">
+      <v-list v-if="dataElement.conceptAssociations.length > 0">
+        <v-subheader>{{ $t('global.conceptAssociations') }}</v-subheader>
+        <v-list-item>
+          <v-list-item-content>
+            <concept-association-table :associations="dataElement.conceptAssociations" />
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-card>
+    <v-btn
+      v-if="showJumpToElementButton"
+      class="d-block mr-0 ml-auto"
+      color="primary"
+      rounded
+      @click="dialog.elementType = 'NAMESPACE'; dialog.showNamespace = true"
+    >
+      {{ $t('global.button.showInTreeView') }}
+      <v-icon dark>
+        mdi-arrow-right-circle
+      </v-icon>
+    </v-btn>
     <v-dialog
       v-model="detailViewDialog.show"
       width="600"
@@ -217,8 +173,10 @@ import ConceptAssociationTable from '~/components/tables/concept-association-tab
 import ValueDomain from '~/components/views/value-domain'
 import NamespaceDetailView from '~/components/views/namespace-detail-view.vue'
 import PathsTable from '~/components/tables/paths-table'
+import DetailViewToolbar from '~/components/common/detail-view-toolbar'
 export default {
   components: {
+    DetailViewToolbar,
     PathsTable,
     DefinitionTable,
     SlotTable,
@@ -388,7 +346,13 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
+
+/* find a better solution */
+.detail-view-container {
+  margin-top: -40px;
+}
+
 .dialogCard {
   padding-top: 40px;
   padding-bottom: 25px;
@@ -397,7 +361,7 @@ export default {
 }
 
 .detailViewCard {
-  margin-bottom: 30px;
+  margin-bottom: 10px;
 }
 
 .designationButton {
diff --git a/components/views/enumerated-value-domain-detail-view.vue b/components/views/enumerated-value-domain-detail-view.vue
index 0f66472..1d8e62c 100644
--- a/components/views/enumerated-value-domain-detail-view.vue
+++ b/components/views/enumerated-value-domain-detail-view.vue
@@ -19,60 +19,19 @@
     <div v-if="valueDomain !== undefined" class="detailView">
       <v-card
         v-if="!hidePath"
-        class="detailViewCard"
         color="grey lighten-4"
         flat
       >
-        <v-toolbar>
-          <v-toolbar-title>
-            <v-container class="text-center">
-              <v-row no-gutters>
-                <v-col v-for="item in elementPathInTree" :key="item.urn">
-                  <v-icon v-if="!item.urn.includes('namespace')">
-                    mdi-slash-forward
-                  </v-icon>
-                  <v-btn
-                    width="130"
-                    class="designationButton"
-                    color="grey lighten-4"
-                    rounded
-                    :disabled="!activatePathNavigation"
-                    @click="showDetailViewDialog(item.urn)"
-                  >
-                    <div
-                      v-if="item.urn === urn"
-                      style="text-align: center; width: 100%; white-space: normal;"
-                    >
-                      {{ item.designation }}
-                    </div>
-                    <a
-                      v-if="item.urn !== urn"
-                      style="text-align: center; width: 100%; white-space: normal;"
-                    >
-                      {{ item.designation }}
-                    </a>
-                  </v-btn>
-                </v-col>
-              </v-row>
-            </v-container>
-          </v-toolbar-title>
-          <v-spacer />
-          <v-btn
-            v-if="editable"
-            icon
-            color="primary"
-            @click="editValueDomain"
-          >
-            <v-icon>mdi-pencil</v-icon>
-          </v-btn>
-          <v-btn
-            v-if="deletable"
-            icon
-            @click="deleteValueDomain"
-          >
-            <v-icon>mdi-delete</v-icon>
-          </v-btn>
-        </v-toolbar>
+        <common-detail-view-toolbar
+          :element-path="elementPathInTree"
+          :element-urn="urn"
+          :activate-navigation="activatePathNavigation"
+          :element-is-deletable="deletable"
+          :element-is-editable="editable"
+          @showDetailViewDialog="showDetailViewDialog($event)"
+          @editElement="editValueDomain"
+          @deleteElement="deleteValueDomain"
+        />
       </v-card>
       <v-card outlined color="transparent" class="ma-0 pa-0">
         <MetaData
@@ -332,7 +291,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 
 .detailView {
   padding: 2px 10px;
@@ -346,7 +305,7 @@ export default {
 }
 
 .detailViewCard {
-  margin-bottom: 30px;
+  margin-bottom: 10px;
 }
 
 .designationButton {
diff --git a/components/views/groups-records-detail-view.vue b/components/views/groups-records-detail-view.vue
index 6c58376..b3bfa74 100644
--- a/components/views/groups-records-detail-view.vue
+++ b/components/views/groups-records-detail-view.vue
@@ -10,8 +10,7 @@
             :size="400"
             color="primary"
             indeterminate
-          >
-          </v-progress-circular>
+          />
         </v-col>
       </v-row>
     </v-container>
@@ -28,75 +27,19 @@
     />
     <v-card
       v-if="!hidePath"
-      class="detailViewCard"
-      color="grey lighten-4"
+      color="grey lighten-4 mt-0 pa-0"
       flat
     >
-      <v-toolbar>
-        <v-toolbar-title>
-          <v-container class="text-center">
-            <v-row no-gutters>
-              <v-col v-for="item in elementPath" :key="item.urn">
-                <v-icon v-if="!item.urn.includes('namespace')">
-                  mdi-slash-forward
-                </v-icon>
-                <v-btn
-                  width="130"
-                  class="designationButton"
-                  color="grey lighten-4"
-                  rounded
-                  :disabled="!activatePathNavigation"
-                  @click="showDetailViewDialog(item.urn)"
-                >
-                  <div
-                    v-if="item.urn === urn"
-                    style="text-align: center; width: 100%; white-space: normal;"
-                  >
-                    {{ item.designation }}
-                  </div>
-                  <a
-                    v-if="item.urn !== urn"
-                    style="text-align: center; width: 100%; white-space: normal;"
-                  >
-                    {{ item.designation }}
-                  </a>
-                </v-btn>
-              </v-col>
-            </v-row>
-          </v-container>
-        </v-toolbar-title>
-        <v-spacer />
-        <v-tooltip bottom>
-          <template #activator="{ on, attrs }">
-            <v-btn
-              v-if="editable"
-              icon
-              color="primary"
-              v-bind="attrs"
-              v-on="on"
-              @click="updateMembers"
-            >
-              <v-icon>mdi-arrow-up-box</v-icon>
-            </v-btn>
-          </template>
-          <span>Update Members</span>
-        </v-tooltip>
-        <v-btn
-          v-if="editable"
-          icon
-          color="primary"
-          @click="editItem"
-        >
-          <v-icon>mdi-pencil</v-icon>
-        </v-btn>
-        <v-btn
-          v-if="deletable"
-          icon
-          @click="deleteItem"
-        >
-          <v-icon>mdi-delete</v-icon>
-        </v-btn>
-      </v-toolbar>
+      <detail-view-toolbar
+        :element-path="elementPath"
+        :element-urn="urn"
+        :activate-navigation="activatePathNavigation"
+        :element-is-deletable="deletable"
+        :element-is-editable="editable"
+        @showDetailViewDialog="showDetailViewDialog($event)"
+        @editElement="editItem"
+        @deleteElement="deleteItem"
+      />
     </v-card>
     <v-card outlined color="transparent" class="ma-0 pa-0">
       <meta-data
@@ -177,6 +120,7 @@
         <NamespaceDetailView
           v-if="detailViewDialog.urn.toUpperCase().includes('NAMESPACE')"
           :urn="detailViewDialog.urn"
+          :show-jump-to-element-button="true"
           :editable="false"
           :deletable="false"
         />
@@ -206,8 +150,10 @@ import MembersTable from '~/components/tables/members-table'
 import GroupRecordDialog from '~/components/dialogs/group-record-dialog'
 import NamespaceDetailView from '~/components/views/namespace-detail-view.vue'
 import PathsTable from '~/components/tables/paths-table'
+import DetailViewToolbar from '~/components/common/detail-view-toolbar'
 export default {
   components: {
+    DetailViewToolbar,
     MetaData,
     PathsTable,
     SlotTable,
@@ -383,7 +329,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 .dialogCard {
   padding-top: 40px;
   padding-bottom: 25px;
@@ -392,7 +338,7 @@ export default {
 }
 
 .detailViewCard {
-  margin-bottom: 30px;
+  margin-bottom: 10px;
 }
 
 .designationButton {
diff --git a/components/views/namespace-detail-view.vue b/components/views/namespace-detail-view.vue
index f994f42..23f6533 100644
--- a/components/views/namespace-detail-view.vue
+++ b/components/views/namespace-detail-view.vue
@@ -25,40 +25,19 @@
     />
     <v-card
       v-if="!hideToolbar"
-      color="grey lighten-4"
+      color="grey lighten-4 ma-0 pa-0"
       flat
     >
-      <!-- Namespace Toolbar TODO: Check of this could be outsourced ...-->
-      <v-toolbar>
-        <v-btn
-          width="140"
-          class="designationButton"
-          color="grey lighten-4"
-          rounded
-        >
-          <div
-            style="text-align: center; width: 100%; white-space: normal;"
-          >
-            {{ namespace.definitions[0].designation }}
-          </div>
-        </v-btn>
-        <v-spacer />
-        <v-btn
-          v-if="editable"
-          icon
-          color="primary"
-          @click="editNamespace"
-        >
-          <v-icon>mdi-pencil</v-icon>
-        </v-btn>
-        <v-btn
-          v-if="deletable"
-          icon
-          @click="deleteNamespace"
-        >
-          <v-icon>mdi-delete</v-icon>
-        </v-btn>
-      </v-toolbar>
+      <detail-view-toolbar
+        :element-path="[namespace.definitions[0]]"
+        :element-urn="urn"
+        :activate-navigation="false"
+        :element-is-deletable="deletable"
+        :element-is-editable="editable"
+        @showDetailViewDialog="showDetailViewDialog($event)"
+        @editElement="editNamespace"
+        @deleteElement="deleteNamespace"
+      />
     </v-card>
     <v-card outlined color="transparent" class="ma-0 pa-0">
       <meta-data
@@ -104,8 +83,10 @@ import DefinitionTable from '~/components/tables/definition-table'
 import SlotTable from '~/components/tables/slot-table'
 import MetaData from '~/components/item/meta-data'
 import NamespaceDialog from '~/components/dialogs/namespace-dialog'
+import DetailViewToolbar from '~/components/common/detail-view-toolbar'
 export default {
   components: {
+    DetailViewToolbar,
     DefinitionTable,
     SlotTable,
     MetaData,
@@ -196,7 +177,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 .designationButton {
   min-width: 50px;
   width: 40px;
@@ -205,4 +186,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.detailViewCard {
+  margin-bottom: 10px;
+}
 </style>
diff --git a/components/views/permitted-value-detail-view.vue b/components/views/permitted-value-detail-view.vue
index 842d6ce..073bf61 100644
--- a/components/views/permitted-value-detail-view.vue
+++ b/components/views/permitted-value-detail-view.vue
@@ -129,7 +129,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 
 .permittedValueDetailView {
   padding: 1rem;
diff --git a/locales/en-US.js b/locales/en-US.js
index 6409c23..a7f4516 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -393,7 +393,7 @@ export default {
           {
             id: 2,
             question: 'How long will my data be persisted in this instance?',
-            answer: 'Every sunday the data will be automatically deleted from the database.'
+            answer: 'The entire database is automatically cleared every sunday.'
           }
         ]
       }
diff --git a/pages/all-elements.vue b/pages/all-elements.vue
index 12d20c3..ca5f208 100644
--- a/pages/all-elements.vue
+++ b/pages/all-elements.vue
@@ -137,43 +137,41 @@
           </template>
         </v-treeview>
       </v-col>
-      <v-col cols="8" class="auto-scroll detail-view-col pa-6 pt-8">
-        <div>
-          <DataElementDetailView
-            v-if="selected && selectedElement.identification.elementType === 'DATAELEMENT'"
-            :urn="selectedElement.identification.urn"
-            :parent-urn="activeElements.slice(-1)[0].parentUrn"
-            :editable="loggedIn && selectedElement.editable"
-            :deletable="loggedIn && selectedElement.editable"
-            @save="updateTree($event); snackbar.saveSuccess = true"
-            @saveFailure="handleSaveFailure($event)"
-            @delete="updateTree(selectedElement) ; snackbar.deleteSuccess = true"
-            @deleteFailure="handleDeleteFailure ($event)"
-          />
-          <GroupsRecordsDetailView
-            v-if="selected && (selectedElement.identification.elementType === 'DATAELEMENTGROUP'
+      <v-col cols="8" class="auto-scroll detail-view-col px-6 pt-8">
+        <GroupsRecordsDetailView
+          v-if="selected && (selectedElement.identification.elementType === 'DATAELEMENTGROUP'
               || selectedElement.identification.elementType === 'RECORD' )"
-            :urn="selectedElement.identification.urn"
-            :parent-urn="activeElements.slice(-1)[0].parentUrn"
-            :editable="loggedIn && selectedElement.editable"
-            :deletable="loggedIn && selectedElement.editable"
-            @save="snackbar.saveSuccess = true"
-            @saveFailure="handleSaveFailure($event)"
-            @reloadMembers="updateTree($event)"
-            @delete="updateTree(selectedElement) ; snackbar.deleteSuccess = true"
-            @deleteFailure="handleDeleteFailure ($event)"
-          />
-          <NamespaceDetailView
-            v-if="selected && selectedElement.identification.elementType === 'NAMESPACE'"
-            :urn="selectedElement.identification.urn"
-            :editable="loggedIn && selectedElement.editable"
-            :deletable="loggedIn && selectedElement.editable"
-            @save="updateTree($event); snackbar.saveSuccess = true"
-            @saveFailure="handleSaveFailure($event)"
-            @delete="updateTree(selectedElement) ; snackbar.deleteSuccess = true"
-            @deleteFailure="handleDeleteFailure ($event)"
-          />
-        </div>
+          :urn="selectedElement.identification.urn"
+          :parent-urn="activeElements.slice(-1)[0].parentUrn"
+          :editable="loggedIn && selectedElement.editable"
+          :deletable="loggedIn && selectedElement.editable"
+          @save="snackbar.saveSuccess = true"
+          @saveFailure="handleSaveFailure($event)"
+          @reloadMembers="updateTree($event)"
+          @delete="updateTree(selectedElement) ; snackbar.deleteSuccess = true"
+          @deleteFailure="handleDeleteFailure ($event)"
+        />
+        <DataElementDetailView
+          v-if="selected && selectedElement.identification.elementType === 'DATAELEMENT'"
+          :urn="selectedElement.identification.urn"
+          :parent-urn="activeElements.slice(-1)[0].parentUrn"
+          :editable="loggedIn && selectedElement.editable"
+          :deletable="loggedIn && selectedElement.editable"
+          @save="updateTree($event); snackbar.saveSuccess = true"
+          @saveFailure="handleSaveFailure($event)"
+          @delete="updateTree(selectedElement) ; snackbar.deleteSuccess = true"
+          @deleteFailure="handleDeleteFailure ($event)"
+        />
+        <NamespaceDetailView
+          v-if="selected && selectedElement.identification.elementType === 'NAMESPACE'"
+          :urn="selectedElement.identification.urn"
+          :editable="loggedIn && selectedElement.editable"
+          :deletable="loggedIn && selectedElement.editable"
+          @save="updateTree($event); snackbar.saveSuccess = true"
+          @saveFailure="handleSaveFailure($event)"
+          @delete="updateTree(selectedElement) ; snackbar.deleteSuccess = true"
+          @deleteFailure="handleDeleteFailure ($event)"
+        />
       </v-col>
     </v-row>
     <v-row v-if="dialog.showDataElement || dialog.showDataElementGroup || dialog.showNamespace">