diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties
index be9da12ec..70afb0198 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=قم بتوضيح موقعك في ش
 siteManagement.label.btn.save=احفظ
 siteManagement.label.btn.cancel=ألغي
 siteManagement.label.btn.next=التالي
-siteManagement.label.btn.createSite=إنشاء موقع
 siteManagement.label.createSite.error=حدث خطأ أثناء إنشاء الموقع
 siteManagement.label.createSite.success=تم إنشاء الموقع بنجاح
 siteManagement.label.siteTemplate.drawer.title=حدد قالب الموقع
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties
index be9da12ec..70afb0198 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=قم بتوضيح موقعك في ش
 siteManagement.label.btn.save=احفظ
 siteManagement.label.btn.cancel=ألغي
 siteManagement.label.btn.next=التالي
-siteManagement.label.btn.createSite=إنشاء موقع
 siteManagement.label.createSite.error=حدث خطأ أثناء إنشاء الموقع
 siteManagement.label.createSite.success=تم إنشاء الموقع بنجاح
 siteManagement.label.siteTemplate.drawer.title=حدد قالب الموقع
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties
index 8cc51e75a..94171b23d 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Il·lustra el teu lloc a la navegaci
 siteManagement.label.btn.save=Desa
 siteManagement.label.btn.cancel=Cancel·la
 siteManagement.label.btn.next=Pròxim
-siteManagement.label.btn.createSite=Crear un lloc
 siteManagement.label.createSite.error=S'ha produït un error en crear el lloc
 siteManagement.label.createSite.success=Lloc creat amb èxit
 siteManagement.label.siteTemplate.drawer.title=Seleccioneu la plantilla del lloc
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties
index 6c5cdcc5c..a54f21257 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate u vostru situ in a naviga
 siteManagement.label.btn.save=Salvà
 siteManagement.label.btn.cancel=Cancella 
 siteManagement.label.btn.next=Dopu
-siteManagement.label.btn.createSite=Crea u situ
 siteManagement.label.createSite.error=Errore durante a creazione di u situ
 siteManagement.label.createSite.success=Site creatu cun successu
 siteManagement.label.siteTemplate.drawer.title=Selezziunà u mudellu di u situ
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties
index 40210933e..d83459cf7 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilustrujte vaše stránky v levé na
 siteManagement.label.btn.save=Uložit
 siteManagement.label.btn.cancel=#{word.cancel}
 siteManagement.label.btn.next=další
-siteManagement.label.btn.createSite=Vytvořit web
 siteManagement.label.createSite.error=Chyba při vytváření webu
 siteManagement.label.createSite.success=Stránka byla úspěšně vytvořena
 siteManagement.label.siteTemplate.drawer.title=Vyberte šablonu webu
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties
index c7966e8c1..a59f35621 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrieren Sie Ihre Seite in der l
 siteManagement.label.btn.save=Speichern
 siteManagement.label.btn.cancel=Abbrechen
 siteManagement.label.btn.next=Nächste
-siteManagement.label.btn.createSite=Seite erstellen
 siteManagement.label.createSite.error=Fehler beim Erstellen der Seite
 siteManagement.label.createSite.success=Die Seite wurde erfolgreich erstellt
 siteManagement.label.siteTemplate.drawer.title=Seitenmodel auswählen
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties
index 478be1c24..c58cd2116 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Εικονογράφηση του si
 siteManagement.label.btn.save=Αποθηκεύσετε
 siteManagement.label.btn.cancel=Ματαίωση
 siteManagement.label.btn.next=Επόμενο
-siteManagement.label.btn.createSite=Δημιουργία Ιστοσελίδας
 siteManagement.label.createSite.error=Σφάλμα κατά τη δημιουργία του site
 siteManagement.label.createSite.success=Η ιστοσελίδα δημιουργήθηκε με επιτυχία
 siteManagement.label.siteTemplate.drawer.title=Επιλέξτε πρότυπο ιστότοπου
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties
index 2e5984d28..08f0727fb 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties
@@ -32,10 +32,18 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
+siteManagement.label.btn.add=Add
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
 siteManagement.label.siteTemplate=Site template
 siteManagement.label.navigationWebsite=Navigation site
 siteManagement.label.template.mandatory=The template is missing, it is mandatory for creating site
+sites.label.name=Name
+sites.label.description=Description
+sites.label.navigation=Navigation
+sites.label.permission=Permissions
+sites.label.actions=Actions
+sites.label.sitePermissions=Site permissions
+sites.label.siteNavigation=Site navigation
+sites.filter.placeholder=Filter by name, description
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties
index 85ab7cbbe..39cc4cb60 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate su sitio en la navegació
 siteManagement.label.btn.save=Guardar
 siteManagement.label.btn.cancel=Cancelar
 siteManagement.label.btn.next=Siguiente
-siteManagement.label.btn.createSite=Crear sitio
 siteManagement.label.createSite.error=Error al crear el sitio
 siteManagement.label.createSite.success=Sitio creado con éxito
 siteManagement.label.siteTemplate.drawer.title=Seleccionar plantilla de sitio
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties
index 81819ef03..82ee5c501 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=سایت خود را در ناوبر
 siteManagement.label.btn.save=ذخيره
 siteManagement.label.btn.cancel=انصراف
 siteManagement.label.btn.next=بعد
-siteManagement.label.btn.createSite=ایجاد سایت
 siteManagement.label.createSite.error=خطا هنگام ایجاد سایت
 siteManagement.label.createSite.success=سایت با موفقیت ایجاد شد
 siteManagement.label.siteTemplate.drawer.title=قالب سایت را انتخاب کنید
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties
index ab644c984..af67b9f44 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Kuvitelkaa sivustoasi vasemmassa nav
 siteManagement.label.btn.save=Tallenna
 siteManagement.label.btn.cancel=Peruuta
 siteManagement.label.btn.next=Seuraava
-siteManagement.label.btn.createSite=Luo Site
 siteManagement.label.createSite.error=Virhe luotaessa sivustoa
 siteManagement.label.createSite.success=Sivusto luotu onnistuneesti
 siteManagement.label.siteTemplate.drawer.title=Valitse sivupohja
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties
index e90dfeaf3..3ec64ded0 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilarawan ang iyong site sa kaliwang
 siteManagement.label.btn.save=I-save
 siteManagement.label.btn.cancel=Ang Kanselahin
 siteManagement.label.btn.next=Susunod
-siteManagement.label.btn.createSite=Lumikha ng Site
 siteManagement.label.createSite.error=Error habang gumagawa ng site
 siteManagement.label.createSite.success=Matagumpay na nalikha ang site
 siteManagement.label.siteTemplate.drawer.title=Pumili ng template ng site
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties
index cffb47745..63d105c0f 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrer votre site dans la navigat
 siteManagement.label.btn.save=Enregistrer
 siteManagement.label.btn.cancel=Annuler
 siteManagement.label.btn.next=Suivant
-siteManagement.label.btn.createSite=Créer un site
 siteManagement.label.createSite.error=Erreur lors de la création du site
 siteManagement.label.createSite.success=Site créé avec succès
 siteManagement.label.siteTemplate.drawer.title=Sélectionner le modèle de site
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties
index 0e345a6b0..8d72ed9ac 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illusztrálja webhelyét a bal oldal
 siteManagement.label.btn.save=Mentés
 siteManagement.label.btn.cancel=Törölje
 siteManagement.label.btn.next=Következő
-siteManagement.label.btn.createSite=Webhely létrehozása
 siteManagement.label.createSite.error=Hiba a webhely létrehozásakor
 siteManagement.label.createSite.success=A webhely sikeresen létrehozva
 siteManagement.label.siteTemplate.drawer.title=Válassza ki a webhelysablont
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties
index f4f972d3d..0916819a7 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilustrasikan situs Anda di navigasi
 siteManagement.label.btn.save=Simpan
 siteManagement.label.btn.cancel=Batal
 siteManagement.label.btn.next=Selanjutnya
-siteManagement.label.btn.createSite=Buat Situs
 siteManagement.label.createSite.error=Terjadi kesalahan saat membuat situs
 siteManagement.label.createSite.success=Situs berhasil dibuat
 siteManagement.label.siteTemplate.drawer.title=Pilih templat situs
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties
index 9bd1c6cb8..f535d08a8 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrare il sito nella navigazione
 siteManagement.label.btn.save=Salvare
 siteManagement.label.btn.cancel=Cancellare
 siteManagement.label.btn.next=Successivo
-siteManagement.label.btn.createSite=Creare il Sito
 siteManagement.label.createSite.error=Errore durante la creazione del sito
 siteManagement.label.createSite.success=Sito creato con successo
 siteManagement.label.siteTemplate.drawer.title=Selezionare un modello di sito
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties
index ff4bca0bf..03b5dbc49 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=左ナビゲーションであなた
 siteManagement.label.btn.save=保存
 siteManagement.label.btn.cancel=キャンセル
 siteManagement.label.btn.next=次へ
-siteManagement.label.btn.createSite=サイトを作成
 siteManagement.label.createSite.error=サイト作成中のエラー
 siteManagement.label.createSite.success=サイトの作成に成功しました
 siteManagement.label.siteTemplate.drawer.title=サイトテンプレートを選択
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties
index aed74ad4d..18132fffd 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=왼쪽 탐색창에 사이트를 설
 siteManagement.label.btn.save=구하다
 siteManagement.label.btn.cancel=취소
 siteManagement.label.btn.next=다음
-siteManagement.label.btn.createSite=사이트 만들기
 siteManagement.label.createSite.error=사이트 생성 중 오류 발생
 siteManagement.label.createSite.success=사이트가 성공적으로 생성되었습니다
 siteManagement.label.siteTemplate.drawer.title=사이트 템플릿 선택
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties
index 87760f297..ff6bcf8b2 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Kairėje naršymo juostoje iliustruo
 siteManagement.label.btn.save=Išsaugoti
 siteManagement.label.btn.cancel=Atšaukti
 siteManagement.label.btn.next=Kitas
-siteManagement.label.btn.createSite=Sukurti svetainę
 siteManagement.label.createSite.error=Klaida kuriant svetainę
 siteManagement.label.createSite.success=Svetainė sėkmingai sukurta
 siteManagement.label.siteTemplate.drawer.title=Pasirinkite svetainės šabloną
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties
index 6cde5b7f6..72f6a0e00 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustreren van uw site in de linker
 siteManagement.label.btn.save=Opslaan
 siteManagement.label.btn.cancel=Annuleren
 siteManagement.label.btn.next=Volgende
-siteManagement.label.btn.createSite=Site maken
 siteManagement.label.createSite.error=Fout bij het maken van site
 siteManagement.label.createSite.success=Site met succes aangemaakt
 siteManagement.label.siteTemplate.drawer.title=Selecteer sitesjabloon
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties
index 574ba3e13..270cefddf 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrere siden din mot venstre nav
 siteManagement.label.btn.save=Lagre
 siteManagement.label.btn.cancel=Avbryt
 siteManagement.label.btn.next=Neste
-siteManagement.label.btn.createSite=Opprett nettsted
 siteManagement.label.createSite.error=Feil under oppretting av side
 siteManagement.label.createSite.success=Nettsted opprettet
 siteManagement.label.siteTemplate.drawer.title=Velg nettstedsmal
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties
index 0ec269111..6c79e6933 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Wyobraź swoją witrynę w lewej naw
 siteManagement.label.btn.save=Zapisz
 siteManagement.label.btn.cancel=Anuluj
 siteManagement.label.btn.next=Następny
-siteManagement.label.btn.createSite=Utwórz witrynę
 siteManagement.label.createSite.error=Błąd podczas tworzenia witryny
 siteManagement.label.createSite.success=Witryna utworzona pomyślnie
 siteManagement.label.siteTemplate.drawer.title=Wybierz szablon witryny
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties
index 73a749d54..b89595666 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilustre seu site na navegação à e
 siteManagement.label.btn.save=Salvar
 siteManagement.label.btn.cancel=Cancelar
 siteManagement.label.btn.next=Próximo
-siteManagement.label.btn.createSite=Criar site
 siteManagement.label.createSite.error=Erro ao criar site
 siteManagement.label.createSite.success=Site criado com sucesso
 siteManagement.label.siteTemplate.drawer.title=Selecionar modelo do site
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties
index 4983e14c8..a1259de38 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilustre seu site na navegação à e
 siteManagement.label.btn.save=Gravar
 siteManagement.label.btn.cancel=Cancelar
 siteManagement.label.btn.next=Próximo
-siteManagement.label.btn.createSite=Criar site
 siteManagement.label.createSite.error=Erro ao criar site
 siteManagement.label.createSite.success=Site criado com sucesso
 siteManagement.label.siteTemplate.drawer.title=Selecionar modelo do site
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties
index b25a07a84..b5dcdbbb1 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilustrați-vă site-ul în navigarea
 siteManagement.label.btn.save=Salvaţi
 siteManagement.label.btn.cancel=Renunță
 siteManagement.label.btn.next=Următoarea
-siteManagement.label.btn.createSite=Creare site
 siteManagement.label.createSite.error=Eroare la crearea site-ului
 siteManagement.label.createSite.success=Site creat cu succes
 siteManagement.label.siteTemplate.drawer.title=Selectaţi şablonul site-ului
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties
index cf3f370f0..572f040b3 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Иллюстрируйте ваш с
 siteManagement.label.btn.save=Сохранить
 siteManagement.label.btn.cancel=Отмена
 siteManagement.label.btn.next=Следующий
-siteManagement.label.btn.createSite=Создать сайт
 siteManagement.label.createSite.error=Ошибка при создании сайта
 siteManagement.label.createSite.success=Сайт успешно создан
 siteManagement.label.siteTemplate.drawer.title=Выберите шаблон сайта
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties
index a04784c2a..832d3938f 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilustrujte svoj web v ľavom naviga
 siteManagement.label.btn.save=Uložiť
 siteManagement.label.btn.cancel=Zrušiť
 siteManagement.label.btn.next=Ďalší
-siteManagement.label.btn.createSite=Vytvoriť stránku
 siteManagement.label.createSite.error=Chyba pri vytváraní stránky
 siteManagement.label.createSite.success=Stránka bola úspešne vytvorená
 siteManagement.label.siteTemplate.drawer.title=Vyberte šablónu lokality
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties
index fa6935910..8a78295c1 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ilustrirajte svoje spletno mesto v l
 siteManagement.label.btn.save=Shrani
 siteManagement.label.btn.cancel=Prekliči
 siteManagement.label.btn.next=Naprej
-siteManagement.label.btn.createSite=Ustvari spletno mesto
 siteManagement.label.createSite.error=Napaka pri ustvarjanju spletnega mesta
 siteManagement.label.createSite.success=Stran uspešno ustvarjena
 siteManagement.label.siteTemplate.drawer.title=Izberite predlogo spletnega mesta
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties
index 7681501ce..a78b683f8 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=crwdns30208:0crwdne30208:0
 siteManagement.label.btn.save=crwdns30210:0crwdne30210:0
 siteManagement.label.btn.cancel=crwdns30212:0crwdne30212:0
 siteManagement.label.btn.next=crwdns30214:0crwdne30214:0
-siteManagement.label.btn.createSite=crwdns30216:0crwdne30216:0
 siteManagement.label.createSite.error=crwdns30218:0crwdne30218:0
 siteManagement.label.createSite.success=crwdns30220:0crwdne30220:0
 siteManagement.label.siteTemplate.drawer.title=crwdns30222:0crwdne30222:0
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties
index faeedeb0e..8f7ca19f8 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrera din webbplats i vänster
 siteManagement.label.btn.save=Spara
 siteManagement.label.btn.cancel=Avbryt
 siteManagement.label.btn.next=Nästa
-siteManagement.label.btn.createSite=Skapa sajt
 siteManagement.label.createSite.error=Fel vid skapande av sajt
 siteManagement.label.createSite.success=Webbplatsen har skapats
 siteManagement.label.siteTemplate.drawer.title=Välj webbplatsmall
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties
index 5f2f5858e..4fe75ea37 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=แสดงเว็บไซต์
 siteManagement.label.btn.save=บันทึก
 siteManagement.label.btn.cancel=ยกเลิก
 siteManagement.label.btn.next=ต่อไป
-siteManagement.label.btn.createSite=สร้างไซต์
 siteManagement.label.createSite.error=เกิดข้อผิดพลาดขณะสร้างไซต์
 siteManagement.label.createSite.success=สร้างไซต์สำเร็จแล้ว
 siteManagement.label.siteTemplate.drawer.title=เลือกเทมเพลตไซต์
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties
index fa171e213..313cbe4b2 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Sitenizi sol gezinmede gösterin
 siteManagement.label.btn.save=Kaydet
 siteManagement.label.btn.cancel=İptal
 siteManagement.label.btn.next=Sonraki
-siteManagement.label.btn.createSite=Site Oluştur
 siteManagement.label.createSite.error=Site oluşturulurken hata oluştu
 siteManagement.label.createSite.success=Site başarıyla oluşturuldu
 siteManagement.label.siteTemplate.drawer.title=Site şablonunu seçin
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties
index 16de92f5d..2394922d9 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Ілюстрація на лівій
 siteManagement.label.btn.save=Зберегти
 siteManagement.label.btn.cancel=Скасувати
 siteManagement.label.btn.next=Уперед
-siteManagement.label.btn.createSite=Створити ділянку
 siteManagement.label.createSite.error=Помилка при створенні сайту
 siteManagement.label.createSite.success=Сайт успішно створений
 siteManagement.label.siteTemplate.drawer.title=Вибір шаблону сайту
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties
index 2e5984d28..9a3ff8550 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Illustrate your site in the left nav
 siteManagement.label.btn.save=Save
 siteManagement.label.btn.cancel=Cancel
 siteManagement.label.btn.next=Next
-siteManagement.label.btn.createSite=Create Site
 siteManagement.label.createSite.error=Error while creating site
 siteManagement.label.createSite.success=Site created successfully
 siteManagement.label.siteTemplate.drawer.title=Select site template
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties
index eedf2bb0a..7451e8d9d 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=Minh họa trang web của bạn tro
 siteManagement.label.btn.save=Lưu
 siteManagement.label.btn.cancel=Hủy bỏ
 siteManagement.label.btn.next=Kế tiếp
-siteManagement.label.btn.createSite=Tạo trang web
 siteManagement.label.createSite.error=Lỗi khi tạo trang web
 siteManagement.label.createSite.success=Trang web đã được tạo thành công
 siteManagement.label.siteTemplate.drawer.title=Chọn mẫu trang web
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties
index ffc584b0d..c132e214d 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=在左侧导航栏显示您的网站
 siteManagement.label.btn.save=存储
 siteManagement.label.btn.cancel=关闭
 siteManagement.label.btn.next=下一个
-siteManagement.label.btn.createSite=创建站点
 siteManagement.label.createSite.error=创建站点时出错
 siteManagement.label.createSite.success=成功创建站点
 siteManagement.label.siteTemplate.drawer.title=选择站点模板
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties
index e79190683..516daf124 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties
@@ -32,7 +32,6 @@ siteManagement.label.bannerSelector.tooltip=在左側導覽中說明您的網站
 siteManagement.label.btn.save=儲存
 siteManagement.label.btn.cancel=取消
 siteManagement.label.btn.next=下一個
-siteManagement.label.btn.createSite=建立網站
 siteManagement.label.createSite.error=建立網站時出錯
 siteManagement.label.createSite.success=網站創建成功
 siteManagement.label.siteTemplate.drawer.title=選擇網站模板
diff --git a/layout-webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/layout-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
index 88618ad6e..3b88fff40 100644
--- a/layout-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/layout-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -304,6 +304,9 @@
       <depends>
         <module>commonLayoutComponents</module>
       </depends>
+      <depends>
+        <module>applicationToolbarComponent</module>
+      </depends>
       <depends>
         <module>imageCropper</module>
       </depends>
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/manage-permissions/ManagePermissionsDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/manage-permissions/ManagePermissionsDrawer.vue
index 30f1a0447..8265ba335 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/manage-permissions/ManagePermissionsDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/manage-permissions/ManagePermissionsDrawer.vue
@@ -22,18 +22,11 @@
     id="managePermissionsDrawer"
     :right="!$vuetify.rtl"
     :allow-expand="isSite"
+    :go-back-button="goBackButton"
     eager
     @closed="close">
     <template slot="title">
-      <div class="d-flex">
-        <v-icon
-          size="16"
-          class="clickable"
-          @click="close">
-          fas fa-arrow-left
-        </v-icon>
-        <span class="ms-2"> {{ drawerTitle }}</span>
-      </div>
+      {{ drawerTitle }}
     </template>
     <template slot="content">
       <v-card class="mx-4 my-4 px-2 py-2 elevation-0">
@@ -81,6 +74,7 @@ export default {
       isSite: false,
       accessPermissionChanged: false,
       editPermissionChanged: false,
+      goBackButton: false,
     };
   },
   computed: {
@@ -100,11 +94,11 @@ export default {
     this.$root.$on('update-access-permission-membership-type', this.updateAccessPermissionMembership);
     this.$root.$on('change-access-permission-type', this.changeAccessPermissionType);
     this.$root.$on('edit-permission-changed', this.editPermissionChanged = true);
-
   },
   methods: {
-    open(object, isSite) {
+    open(object, isSite, noGoBackButton) {
       this.isSite = isSite || false;
+      this.goBackButton = !noGoBackButton;
       if (this.isSite) {
         this.site = JSON.parse(JSON.stringify(object));
         this.editPermission = JSON.parse(JSON.stringify(object.editPermission));
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteCard.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteCard.vue
deleted file mode 100644
index 9cf14eac4..000000000
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteCard.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
- This file is part of the Meeds project (https://meeds.io/).
- 
- Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
- 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-card
-    height="240"
-    max-height="240"
-    outlined
-    hover
-    @click="openSiteNavigationDrawer">
-    <v-toolbar
-      flat
-      dense
-      class="mt-2">
-      <span class="font-weight-bold">  {{ site.displayName || site.name }} </span>
-      <v-spacer />
-      <site-management-site-card-menu
-        :site="site" />
-    </v-toolbar>
-    <div class="d-flex flex-grow-0 flex-shrink-1 rich-editor-content">
-      <span class="align-self-center text-wrap text-left text-break mx-4 text-truncate-4" v-sanitized-html="site.description"></span>
-    </div>
-    <v-footer absolute class="px-0 py-0">
-      <v-toolbar
-        flat
-        dense>
-        <v-icon
-          v-if="isGroupSite"
-          size="19"
-          color="primary"
-          class="fas fa-users me-3" />
-        <v-icon
-          v-else
-          size="19"
-          color="primary"
-          class="fas fa-compass me-3" />
-        <span> {{ siteTypeLabel }} </span>
-      </v-toolbar>
-    </v-footer>
-  </v-card>
-</template>
-<script>
-export default {
-  props: {
-    site: {
-      type: Object,
-      default: null,
-    },
-  },
-  computed: {
-    isGroupSite() {
-      return this.site.siteType === 'GROUP';
-    },
-    siteTypeLabel() {
-      return this.$t(`siteManagement.label.${this.site.siteType.toLowerCase()}`) ;
-    },
-  },
-  methods: {
-    openSiteNavigationDrawer() {
-      if (this.site?.canEdit) {
-        const params = {
-          siteName: this.site.name,
-          siteType: this.site.siteType,
-          siteId: this.site.siteId,
-          includeGlobal: this.site.name.toLowerCase() === eXo.env.portal.globalPortalName.toLowerCase()
-        };
-        this.$root.$emit('open-site-navigation-drawer', params);
-      }
-    },
-  }
-};
-</script>
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue
index 52780feaf..132c121d1 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue
@@ -18,9 +18,14 @@
 -->
 <template>
   <v-app class="siteManagementApplication">
-    <v-main class="pa-5 application-body">
-      <site-management-toolbar />
-      <site-management-sites-list :sites="sites" />
+    <v-main class="application-body">
+      <site-management-toolbar
+        ref="toolbar"
+        @site-filter="keyword = $event" />
+      <site-management-list
+        :sites="sites"
+        :loading="loading > 0"
+        :keyword="keyword" />
     </v-main>
     <exo-confirm-dialog
       ref="deleteSiteConfirmDialog"
@@ -46,6 +51,7 @@ export default {
       sites: [],
       loading: 0,
       siteToDelete: null,
+      keyword: null,
       deleteConfirmMessage: '',
     };
   },
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteToolbar.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteToolbar.vue
deleted file mode 100644
index 3a73573c6..000000000
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteToolbar.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- This file is part of the Meeds project (https://meeds.io/).
- 
- Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
- 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-toolbar
-    flat
-    dense>
-    <v-btn class="primary" @click="$root.$emit('open-site-properties-drawer')">
-      {{ $t('siteManagement.label.btn.createSite') }}
-    </v-btn>
-    <v-spacer />
-  </v-toolbar>
-</template>
-
-<script setup>
-</script>
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SitesList.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/SitesList.vue
deleted file mode 100644
index 7f9fbf1eb..000000000
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SitesList.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- This file is part of the Meeds project (https://meeds.io/).
- 
- Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
- 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-layout class="pa-3">
-    <v-row no-gutters>
-      <v-col
-        v-for="site in sites"
-        :key="site.id"
-        class="mb-4"
-        cols="12"
-        sm="6"
-        lg="4">
-        <site-management-site-card
-          :site="site"
-          class="mx-2" />
-      </v-col>
-    </v-row>
-  </v-layout>
-</template>
-<script>
-export default {
-  props: {
-    sites: {
-      type: Array,
-      default: () => [],
-    },
-  }
-};
-</script>
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SitePropertiesDrawer.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/drawer/SitePropertiesDrawer.vue
similarity index 99%
rename from layout-webapp/src/main/webapp/vue-app/site-management/components/SitePropertiesDrawer.vue
rename to layout-webapp/src/main/webapp/vue-app/site-management/components/drawer/SitePropertiesDrawer.vue
index 1d9e09ad9..8272eadd9 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SitePropertiesDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/drawer/SitePropertiesDrawer.vue
@@ -36,6 +36,9 @@
           <translation-text-field
             ref="siteTitleTranslation"
             v-model="siteTitleTranslations"
+            v-bind="{
+              autofocus: true,
+            }"
             :field-value.sync="siteLabel"
             :maxlength="maxTitleLength"
             :no-expand-icon="!expanded"
@@ -48,7 +51,6 @@
             name="siteTitle"
             class="width-auto flex-grow-1 pt-4"
             back-icon
-            autofocus
             required
             @blur="convertSiteName">
             <template #title>
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteTemplateDrawer.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/drawer/SiteTemplateDrawer.vue
similarity index 99%
rename from layout-webapp/src/main/webapp/vue-app/site-management/components/SiteTemplateDrawer.vue
rename to layout-webapp/src/main/webapp/vue-app/site-management/components/drawer/SiteTemplateDrawer.vue
index b084e5da2..35d32aca4 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteTemplateDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/drawer/SiteTemplateDrawer.vue
@@ -70,10 +70,8 @@
     </template>
   </exo-drawer>
 </template>
-
 <script>
 export default {
-
   data() {
     return {
       template: 'navigationWebsite',
@@ -97,7 +95,6 @@ export default {
   created() {
     this.$root.$on('open-site-template-drawer', this.open);
     this.$root.$on('close-site-template-drawer', this.close);
-
   },
   methods: {
     open() {
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteBannerSelector.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/form/SiteBannerSelector.vue
similarity index 100%
rename from layout-webapp/src/main/webapp/vue-app/site-management/components/SiteBannerSelector.vue
rename to layout-webapp/src/main/webapp/vue-app/site-management/components/form/SiteBannerSelector.vue
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/header/SiteToolbar.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/header/SiteToolbar.vue
new file mode 100644
index 000000000..817ed1eab
--- /dev/null
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/header/SiteToolbar.vue
@@ -0,0 +1,52 @@
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <application-toolbar
+    id="sitesToolbar"
+    :right-text-filter="{
+      minCharacters: 1,
+      placeholder: $t('sites.filter.placeholder'),
+      tooltip: $t('sites.filter.placeholder'),
+    }"
+    class="border-box-sizing px-1"
+    @filter-text-input="$emit('site-filter', $event)">
+    <template v-if="!$root.isMobile" #left>
+      <v-btn
+        id="applicationToolbarLeftButton"
+        :aria-label="$t('siteManagement.label.btn.add')"
+        :class="$root.isMobile && 'px-0'"
+        class="btn btn-primary text-truncate"
+        @click="$root.$emit('open-site-properties-drawer')">
+        <v-icon
+          size="18">
+          fa-plus
+        </v-icon>
+        <span
+          v-if="!$root.isMobile"
+          class="text-truncate text-none ms-2">
+          {{ $t('siteManagement.label.btn.add') }}
+        </span>
+      </v-btn>
+    </template>
+  </application-toolbar>
+</template>
+<script></script>
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/main/Item.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/main/Item.vue
new file mode 100644
index 000000000..8848cbbd5
--- /dev/null
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/main/Item.vue
@@ -0,0 +1,106 @@
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <tr>
+    <!-- Illustration -->
+    <td
+      align="center"
+      width="35px">
+      <v-icon size="28">{{ site.icon || 'fa-globe' }}</v-icon>
+    </td>
+    <!-- name -->
+    <td
+      align="left"
+      v-sanitized-html="name"></td>
+    <!-- description -->
+    <td
+      v-if="!$vuetify.breakpoint.lgAndDown"
+      align="left"
+      v-sanitized-html="description"></td>
+    <td v-if="!$vuetify.breakpoint.lgAndDown" align="center">
+      <v-btn
+        :aria-label="$t('sites.label.sitePermissions')"
+        icon
+        @click="openSiteNavigationDrawer">
+        <v-icon size="20">fa-project-diagram</v-icon>
+      </v-btn>
+    </td>
+    <td v-if="!$vuetify.breakpoint.lgAndDown" align="center">
+      <v-btn
+        :aria-label="$t('sites.label.siteNavigation')"
+        icon
+        @click="$root.$emit('open-manage-permissions-drawer', site, true, true)">
+        <v-icon size="20">fa-shield-alt</v-icon>
+      </v-btn>
+    </td>
+    <td align="center">
+      <site-management-item-menu :site="site" />
+    </td>
+  </tr>
+</template>
+<script>
+export default {
+  props: {
+    site: {
+      type: Object,
+      default: null,
+    },
+  },
+  data: () => ({
+    menu: false,
+    hoverMenu: false,
+  }),
+  computed: {
+    siteId() {
+      return this.site?.id;
+    },
+    name() {
+      return this.$te(this.site?.displayName) ? this.$t(this.site?.displayName) : this.site?.displayName;
+    },
+    description() {
+      return this.$te(this.site?.description) ? this.$t(this.site?.description) : this.site?.description;
+    },
+  },
+  watch: {
+    hoverMenu() {
+      if (!this.hoverMenu) {
+        window.setTimeout(() => {
+          if (!this.hoverMenu) {
+            this.menu = false;
+          }
+        }, 200);
+      }
+    },
+  },
+  methods: {
+    openSiteNavigationDrawer() {
+      const params = {
+        siteName: this.site.name,
+        siteType: this.site.siteType,
+        siteId: this.site.siteId,
+        includeGlobal: this.site.name.toLowerCase() === eXo.env.portal.globalPortalName.toLowerCase()
+      };
+      this.$root.$emit('open-site-navigation-drawer', params);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/main/List.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/main/List.vue
new file mode 100644
index 000000000..a49e32338
--- /dev/null
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/main/List.vue
@@ -0,0 +1,195 @@
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-data-table
+    :headers="headers"
+    :items="filteredSites"
+    :loading="loading"
+    :disable-sort="$root.isMobile"
+    :hide-default-header="$root.isMobile"
+    :custom-sort="!$root.isMobile && applySortOnItems"
+    :must-sort="!$root.isMobile"
+    disable-pagination
+    hide-default-footer
+    class="application-body sitesTable px-5 pb-5">
+    <template slot="item" slot-scope="props">
+      <site-management-item
+        :key="props.item.id"
+        :site="props.item" />
+    </template>
+  </v-data-table>
+</template>
+<script>
+export default {
+  props: {
+    sites: {
+      type: Array,
+      default: () => [],
+    },
+    keyword: {
+      type: String,
+      default: null,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    headers() {
+      return (this.$root.isMobile && [
+        {
+          text: '',
+          value: 'icon',
+          align: 'left',
+          sortable: false,
+          class: 'site-icon-header',
+          width: '75px'
+        },
+        {
+          text: this.$t('sites.label.name'),
+          value: 'name',
+          align: 'left',
+          sortable: false,
+          class: 'site-name-header',
+          width: 'auto'
+        },
+        {
+          text: this.$t('sites.label.actions'),
+          value: 'actions',
+          align: 'center',
+          sortable: false,
+          class: 'site-actions-header',
+          width: '75px'
+        },
+      ]) || (this.$vuetify.breakpoint.lgAndDown && [
+        {
+          text: '',
+          value: 'icon',
+          align: 'left',
+          sortable: false,
+          class: 'site-icon-header',
+          width: '75px'
+        },
+        {
+          text: this.$t('sites.label.name'),
+          value: 'name',
+          align: 'left',
+          sortable: true,
+          class: 'site-name-header',
+          width: 'auto'
+        },
+        {
+          text: this.$t('sites.label.description'),
+          value: 'description',
+          align: 'left',
+          sortable: false,
+          class: 'site-description-header',
+          width: 'auto'
+        },
+        {
+          text: this.$t('sites.label.actions'),
+          value: 'actions',
+          align: 'center',
+          sortable: false,
+          class: 'site-actions-header',
+          width: '75px'
+        },
+      ]) || [
+        {
+          text: '',
+          value: 'icon',
+          align: 'left',
+          sortable: false,
+          class: 'site-icon-header',
+          width: '75px'
+        },
+        {
+          text: this.$t('sites.label.name'),
+          value: 'displayName',
+          align: 'left',
+          sortable: true,
+          class: 'site-name-header',
+          width: 'auto'
+        },
+        {
+          text: this.$t('sites.label.description'),
+          value: 'description',
+          align: 'left',
+          sortable: false,
+          class: 'site-description-header',
+          width: 'auto'
+        },
+        {
+          text: this.$t('sites.label.navigation'),
+          value: 'navigation',
+          align: 'center',
+          sortable: false,
+          class: 'site-navigation-header',
+          width: '75px'
+        },
+        {
+          text: this.$t('sites.label.permission'),
+          value: 'permission',
+          align: 'center',
+          sortable: false,
+          class: 'site-permission-header',
+          width: '75px'
+        },
+        {
+          text: this.$t('sites.label.actions'),
+          value: 'actions',
+          align: 'center',
+          sortable: false,
+          class: 'site-actions-header',
+          width: '75px'
+        },
+      ];
+    },
+    filteredSites() {
+      return this.keyword?.length && this.sites.filter(s => {
+        const name = this.$te(s.name) ? this.$t(s.name) : s.name;
+        const description = this.$te(s.description) ? this.$t(s.description) : s.description;
+        return name?.toLowerCase?.()?.includes(this.keyword.toLowerCase())
+          || this.$utils.htmlToText(description)?.toLowerCase?.()?.includes(this.keyword.toLowerCase());
+      }) || this.sites;
+    },
+  },
+  methods: {
+    applySortOnItems(sites, sortFields, sortDescendings) {
+      for (let i = 0; i < sortFields.length; i++) {
+        sites = this.applySortOnItemsUsingField(sites, sortFields[i], sortDescendings[i]);
+      }
+      return sites;
+    },
+    applySortOnItemsUsingField(sites, field, desc) {
+      if (field === 'name') {
+        sites.sort((a, b) => this.$root.collator.compare(a.name.toLowerCase(), b.name.toLowerCase()));
+      }
+      if (desc) {
+        sites.reverse();
+      }
+      return sites;
+    },
+  },
+};
+</script>
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteCardMenu.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/main/Menu.vue
similarity index 99%
rename from layout-webapp/src/main/webapp/vue-app/site-management/components/SiteCardMenu.vue
rename to layout-webapp/src/main/webapp/vue-app/site-management/components/main/Menu.vue
index d4e3dbf37..1e78c7b17 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteCardMenu.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/main/Menu.vue
@@ -72,7 +72,7 @@
         :aria-label="$t('siteManagement.label.manageAccess')"
         role="button"
         class="subtitle-2 px-3"
-        @click="$root.$emit('open-manage-permissions-drawer', site, true)">
+        @click="$root.$emit('open-manage-permissions-drawer', site, true, true)">
         <v-icon
           size="13"
           class="me-2 ms-0"
@@ -104,7 +104,6 @@
     </v-list>
   </v-menu>
 </template>
-
 <script>
 export default {
   props: {
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/initComponents.js b/layout-webapp/src/main/webapp/vue-app/site-management/initComponents.js
index 8e55b1e37..f194acfb6 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/initComponents.js
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/initComponents.js
@@ -18,24 +18,31 @@
  */
 
 import SiteManagement from './components/SiteManagement.vue';
-import SitesList from './components/SitesList.vue';
-import SiteCard from './components/SiteCard.vue';
-import SiteCardMenu from './components/SiteCardMenu.vue';
-import SitePropertiesDrawer from './components/SitePropertiesDrawer.vue';
-import SiteBannerSelector from './components/SiteBannerSelector.vue';
-import SiteToolbar from './components/SiteToolbar.vue';
-import SiteTemplateDrawer from './components/SiteTemplateDrawer.vue';
 
+import SiteToolbar from './components/header/SiteToolbar.vue';
+
+import SiteList from './components/main/List.vue';
+import SiteItem from './components/main/Item.vue';
+import SiteItemMenu from './components/main/Menu.vue';
+
+import SitePropertiesDrawer from './components/drawer/SitePropertiesDrawer.vue';
+import SiteTemplateDrawer from './components/drawer/SiteTemplateDrawer.vue';
+
+import SiteBannerSelector from './components/form/SiteBannerSelector.vue';
 
 const components = {
   'site-management': SiteManagement,
-  'site-management-sites-list': SitesList,
-  'site-management-site-card': SiteCard,
-  'site-management-site-card-menu': SiteCardMenu,
-  'site-properties-drawer': SitePropertiesDrawer ,
-  'site-management-banner-selector': SiteBannerSelector ,
+
   'site-management-toolbar': SiteToolbar ,
-  'site-template-drawer': SiteTemplateDrawer ,
+
+  'site-management-list': SiteList,
+  'site-management-item': SiteItem,
+  'site-management-item-menu': SiteItemMenu,
+
+  'site-properties-drawer': SitePropertiesDrawer,
+  'site-template-drawer': SiteTemplateDrawer,
+
+  'site-management-banner-selector': SiteBannerSelector ,
 };
 
 for (const key in components) {
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/main.js b/layout-webapp/src/main/webapp/vue-app/site-management/main.js
index 96e8edd79..3d99791ac 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/main.js
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/main.js
@@ -19,6 +19,7 @@
 
 import './initComponents.js';
 import '../common-layout-components/initComponents.js';
+import '../common-site-template/initComponents.js';
 
 // get overridden components if exists
 if (extensionRegistry) {
@@ -52,6 +53,11 @@ export function init() {
         data: () => ({
           pageTemplates: null,
         }),
+        computed: {
+          isMobile() {
+            return this.$vuetify.breakpoint.smAndDown;
+          },
+        },
       }, `#${appId}`, 'site-management');
     });
 }
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/site-template/components/main/Item.vue b/layout-webapp/src/main/webapp/vue-app/site-template/components/main/Item.vue
index 5691b9987..15223b691 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-template/components/main/Item.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-template/components/main/Item.vue
@@ -48,9 +48,7 @@
         hide-details
         @click="changeStatus" />
     </td>
-    <td
-      v-if="!$root.isMobile"
-      align="center">
+    <td align="center">
       <site-template-menu :site-template="siteTemplate" />
     </td>
   </tr>
diff --git a/layout-webapp/src/main/webapp/vue-app/site-template/components/main/List.vue b/layout-webapp/src/main/webapp/vue-app/site-template/components/main/List.vue
index 4879bdcc5..084e098ec 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-template/components/main/List.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-template/components/main/List.vue
@@ -73,6 +73,14 @@ export default {
           class: 'site-template-name-header',
           width: '100%'
         },
+        {
+          text: this.$t('sites.label.actions'),
+          value: 'actions',
+          align: 'center',
+          sortable: false,
+          class: 'site-template-actions-header',
+          width: '75px'
+        },
       ]) || (this.$vuetify.breakpoint.lgAndDown && [
         {
           text: '',