diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
index 12e527b49..ce9f689ca 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
@@ -74,7 +74,7 @@ export default {
       navigationNode: null,
       elementName: null,
       elementTitle: null,
-      pageTemplate: 'empty',
+      pageTemplate: null,
       selectedPage: null,
       loading: false,
       resetDrawer: true,
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue
index c574c557b..01e59ac0a 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue
@@ -31,13 +31,12 @@
       v-if="!allSites"
       v-model="selectedSiteNavigation"
       :all-sites="allSites"
-      class="mb-6" />
+      :class="!allSites && 'mb-8'" />
     <site-navigation-page-suggester
       :page="selectedPage"
       :all-sites="allSites"
       :site-type="selectedSiteNavigation?.siteType"
-      :site-name="selectedSiteNavigation?.name"
-      class="mb-8" />
+      :site-name="selectedSiteNavigation?.name" />
   </div>
 </template>
 
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue
index 802d70a68..2d8f2df9e 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue
@@ -21,7 +21,8 @@
   <div>
     <div
       :style="imageContainerStyle"
-      class="overflow-hidden border-color rounded pa-1 hover-elevation"
+      :class="selected && 'primary-border-color' || 'border-color'"
+      class="overflow-hidden rounded pa-1 hover-elevation"
       @click="selectTemplate">
       <img
         :src="illustrationSrc"
@@ -32,11 +33,11 @@
       <p
         v-if="title"
         v-sanitized-html="title"
-        class="mb-0 font-weight-regular text-truncate subtitle-2"></p>
+        class="mb-0 font-weight-regular text-truncate"></p>
       <p
         v-if="description"
         v-sanitized-html="description"
-        class="mb-0 caption text-truncate-2"></p>
+        class="mb-0 text-subtitle text-truncate-2"></p>
     </div>
   </div>
 </template>
@@ -48,6 +49,11 @@ export default {
       default: null
     },
   },
+  data() {
+    return {
+      selected: false
+    };
+  },
   computed: {
     title() {
       return this.pageTemplate?.name;
@@ -79,11 +85,12 @@ export default {
         'max-height': '100px',
         'height': '100px'
       };
-    },
+    }
   },
   methods: {
     selectTemplate() {
       this.$root.$emit('page-template-changed', this.pageTemplate);
+      this.selected = !this.selected;
     }
   }
 };
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
index 9e144b634..ffefff534 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
@@ -112,7 +112,7 @@
                   <site-navigation-existing-page-element
                     v-if="!isNewPageElement"
                     :selected-page="selectedPage" />
-                  <div class="d-flex align-center justify-space-between flex-row ms-8 pb-2">
+                  <div class="d-flex align-center justify-space-between flex-row ms-8 pb-2 mt-2">
                     <span>
                       {{ $t('siteNavigation.label.openSameTab') }}
                     </span>
@@ -272,7 +272,7 @@ export default {
       isScheduled: false,
       disableNodeId: false,
       displayNodeName: false,
-      elementType: 'Group',
+      elementType: 'PAGE',
       allSites: true,
       nodeTarget: true,
       parentNavigationNodeUrl: '',
@@ -388,7 +388,7 @@ export default {
       this.visible = true;
       this.isScheduled = false;
       this.displayNodeName = false;
-      this.elementType = 'Group';
+      this.elementType = 'PAGE';
       this.nodeTarget = true;
       this.disableNodeId = false;
       this.editMode= false;