diff --git a/home/_data/end_cta.yml b/home/_data/general/end_cta.yml
similarity index 100%
rename from home/_data/end_cta.yml
rename to home/_data/general/end_cta.yml
diff --git a/home/_data/footer.yml b/home/_data/general/footer.yml
similarity index 100%
rename from home/_data/footer.yml
rename to home/_data/general/footer.yml
diff --git a/home/_data/function.yml b/home/_data/general/function.yml
similarity index 100%
rename from home/_data/function.yml
rename to home/_data/general/function.yml
diff --git a/home/_data/learn_cta.yml b/home/_data/general/learn_cta.yml
similarity index 100%
rename from home/_data/learn_cta.yml
rename to home/_data/general/learn_cta.yml
diff --git a/home/_data/stats.yml b/home/_data/general/stats.yml
similarity index 100%
rename from home/_data/stats.yml
rename to home/_data/general/stats.yml
diff --git a/home/_includes/footer.html b/home/_includes/footer.html
index 77d3396d..fa8a83ec 100644
--- a/home/_includes/footer.html
+++ b/home/_includes/footer.html
@@ -10,7 +10,8 @@
 
       <div class="flex-grow flex flex-wrap md:pl-20 -mb-10 md:mt-0 mt-10 md:text-left text-center">
       
-      {% for cat in site.data.footer %}
+      {% assign footer  = footer|default: site.data.general.footer %}
+      {% for cat in footer %}
         <div class="lg:w-1/4 md:w-1/2 w-full px-4">
           <h2 class="footer-categorie title-font">{{ cat.title }}</h2>
           <nav class="list-none mb-10">
diff --git a/home/_includes/stats.html b/home/_includes/stats.html
index d36ca243..c1ec65d1 100644
--- a/home/_includes/stats.html
+++ b/home/_includes/stats.html
@@ -1,7 +1,9 @@
 <section class="cm-gray-2 body-font">
   <div class="container px-5 py-24 mx-auto">
     <div class="flex flex-wrap -m-4 text-center">
-    {% for item in site.data.stats.stats %}
+
+    {% assign stats = stats|default:site.data.general.stats.stats %}
+    {% for item in stats %}
       <div class="p-4 sm:w-1/4 w-1/2">
         <h2 class="title-font font-medium sm:text-4xl text-3xl cm-gray-1">{{ item.number }}</h2>
         <p class="leading-relaxed">{{ item.name }}</p>
diff --git a/home/_layouts/branche.html b/home/_layouts/branche.html
new file mode 100644
index 00000000..9ea3442f
--- /dev/null
+++ b/home/_layouts/branche.html
@@ -0,0 +1,14 @@
+---
+layout: default
+---
+
+{% include hero.html title=site.tagline title_2=page.title_2 image='https://dummyimage.com/860x600' color='with InvenTree' %}
+
+{% assign data = site.data[page.data] %}
+{% include features.html data=data %}
+
+{% include cta.html cta=site.data.general.learn_cta %}
+{% include functions.html data=site.data.general.function %}
+{% include cta.html cta=site.data.general.end_cta %}
+
+---
diff --git a/home/business.md b/home/business.md
index f0c6654b..8224cc75 100644
--- a/home/business.md
+++ b/home/business.md
@@ -1,16 +1,6 @@
 ---
-layout: default
-backLink: false
----
-
-{% include hero.html title=site.tagline title_2='for Business' image='https://dummyimage.com/860x600' color='with InvenTree' %}
-
-{% include features.html data=site.data.for_business %}
-
-{% include cta.html cta=site.data.learn_cta %}
-
-{% include functions.html data=site.data.function %}
-
-{% include cta.html cta=site.data.end_cta %}
-
+layout: branche
+title: For Business
+title_2: for Business
+data: for_business
 ---
diff --git a/home/education.md b/home/education.md
index f5d73da4..1c831a21 100644
--- a/home/education.md
+++ b/home/education.md
@@ -1,16 +1,6 @@
 ---
-layout: default
-backLink: false
----
-
-{% include hero.html title=site.tagline title_2='for Education' image='https://dummyimage.com/860x600' color='with InvenTree' %}
-
-{% include features.html data=site.data.for_edu %}
-
-{% include cta.html cta=site.data.learn_cta %}
-
-{% include functions.html data=site.data.function %}
-
-{% include cta.html cta=site.data.end_cta %}
-
+layout: branche
+title: For Education
+title_2: for Education
+data: for_edu
 ---
diff --git a/home/hobby.md b/home/hobby.md
new file mode 100644
index 00000000..677b3eac
--- /dev/null
+++ b/home/hobby.md
@@ -0,0 +1,6 @@
+---
+layout: branche
+title: For Hobby
+title_2: for Hobby
+data: for_hobby
+---
diff --git a/home/index.md b/home/index.md
index 3bd6a272..10edba37 100644
--- a/home/index.md
+++ b/home/index.md
@@ -5,7 +5,7 @@ backLink: false
 
 {% include hero.html title=site.tagline title_2='and more' image='https://dummyimage.com/860x600' color='with InvenTree' %}
 
-{% include functions.html data=site.data.function %}
+{% include functions.html data=site.data.general.function %}
 
 {% include features.html data=site.data.for_hobby %}
 
@@ -13,8 +13,8 @@ backLink: false
 
 {% include features.html data=site.data.for_edu %}
 
-{% include stats.html data=site.data.stats %}
+{% include stats.html data=site.data.general.stats %}
 
-{% include cta.html cta=site.data.end_cta %}
+{% include cta.html cta=site.data.general.end_cta %}
 
 ---