diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index 751dbae..8698c4f 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -7,7 +7,8 @@ const nav = inject<Ref<NavItem[]>>('navigation')
 let navigation = nav;
 if (root == 'framework') {
   const pkg = route.path.split('/').filter(Boolean)[1];
-  navigation = computed(() => nav!.value[1].children.find(item => item._path.startsWith('/framework/'+pkg))?.children || [])
+//  navigation = computed(() => nav!.value[1].children.find(item => item._path.startsWith('/framework/'+pkg))?.children || [])
+  navigation = computed(() => nav!.value[1].children || [])
 } else if (root == 'tutorials') {
   navigation = computed(() => nav.value.filter(item => item._path.startsWith('/tutorials')))
 } else if (root == 'geniebuilder') {
@@ -64,8 +65,8 @@ const links = computed(() => [toc?.bottom?.edit && {
 
       <template #left v-if="root!='tutorials'">
         <UAside >
-        <PkgSelect v-if="root== 'framework'"/>
-          <UNavigationTree :links="mapContentNavigation(navigation)" :multiple="false" default-open style="min-height:600px"/>
+        <PkgSelect v-if="root== 'framework'"/> 
+          <UNavigationTree :links="mapContentNavigation(navigation)" :multiple="true" default-open style="min-height:600px" :defaultOpen="1"/>
         </UAside>
       </template>
 
diff --git a/content/2.framework/0.index.md b/content/2.framework/0.index.md
index 175326c..6b0fe97 100644
--- a/content/2.framework/0.index.md
+++ b/content/2.framework/0.index.md
@@ -1,6 +1,5 @@
 ---
-title: "Genie Framework"
-redirect: /framework/guides/
+title: "Framework introduction"
 ---
 
 # Welcome to Genie Framework!
@@ -10,14 +9,13 @@ Genie is a powerful full-stack web framework for the Julia programming language,
 
 <img src="/assets/docs/guides/intro/framework.png">
 
-Genie Framework has three main components: Genie, Stipple and SearchLight.
+Genie Framework has three main components: Genie, Stipple, SearchLight and Genie Builder.
 
 **[Genie.jl](/framework/genie.jl/docs/)** provides backend and frontend tools, so that you can build **full stack web apps** and APIs around your Julia code.
 
 For **real-time interactivity** and a rich UI, like what's needed in a **dashboard**, **[Stipple.jl](/framework/stipple.jl/docs/)** provides a reactive UI layer.
 
-For **database persistence**, Genie's ORM, **[SearchLight.jl](/framework/searchlight.jl)**, can be added at any time.
-
+For **database persistence**, Genie's ORM, **[SearchLight.jl](/framework/searchlight.jl/docs)**, can be added at any time.
 
 
 ## Getting started
@@ -54,7 +52,7 @@ using GenieFramework
 @genietools
 
 @app begin
-  @out name = "Genie"
+  @in name = "Genie"
 end
 
 function ui()
diff --git a/content/2.framework/1.guides/0.index.md b/content/2.framework/5.guides/0.index.md
similarity index 99%
rename from content/2.framework/1.guides/0.index.md
rename to content/2.framework/5.guides/0.index.md
index 6b0fe97..fc9dacb 100644
--- a/content/2.framework/1.guides/0.index.md
+++ b/content/2.framework/5.guides/0.index.md
@@ -1,5 +1,6 @@
 ---
 title: "Framework introduction"
+navigation: false
 ---
 
 # Welcome to Genie Framework!
diff --git a/content/2.framework/1.guides/1.workflows/1.Importing-code.md b/content/2.framework/5.guides/1.workflows/1.Importing-code.md
similarity index 100%
rename from content/2.framework/1.guides/1.workflows/1.Importing-code.md
rename to content/2.framework/5.guides/1.workflows/1.Importing-code.md
diff --git a/content/2.framework/1.guides/1.workflows/4.Controlling-load-order.md b/content/2.framework/5.guides/1.workflows/4.Controlling-load-order.md
similarity index 100%
rename from content/2.framework/1.guides/1.workflows/4.Controlling-load-order.md
rename to content/2.framework/5.guides/1.workflows/4.Controlling-load-order.md
diff --git a/content/2.framework/1.guides/2.deployments/1.deploying-genie-apps.md b/content/2.framework/5.guides/2.deployments/1.deploying-genie-apps.md
similarity index 100%
rename from content/2.framework/1.guides/2.deployments/1.deploying-genie-apps.md
rename to content/2.framework/5.guides/2.deployments/1.deploying-genie-apps.md
diff --git a/content/2.framework/1.guides/2.deployments/6.NGINX-reverse-proxy.md b/content/2.framework/5.guides/2.deployments/6.NGINX-reverse-proxy.md
similarity index 100%
rename from content/2.framework/1.guides/2.deployments/6.NGINX-reverse-proxy.md
rename to content/2.framework/5.guides/2.deployments/6.NGINX-reverse-proxy.md
diff --git a/content/2.framework/1.guides/2.deployments/99.Deploying-to-AWS.md b/content/2.framework/5.guides/2.deployments/99.Deploying-to-AWS.md
similarity index 100%
rename from content/2.framework/1.guides/2.deployments/99.Deploying-to-AWS.md
rename to content/2.framework/5.guides/2.deployments/99.Deploying-to-AWS.md
diff --git a/content/2.framework/1.guides/_dir.yml b/content/2.framework/5.guides/_dir.yml
similarity index 100%
rename from content/2.framework/1.guides/_dir.yml
rename to content/2.framework/5.guides/_dir.yml