diff --git a/src/vision/layouts/diagramLayouts.json b/src/vision/layouts/diagramLayouts.json
index 2b96bf5..db3c43a 100644
--- a/src/vision/layouts/diagramLayouts.json
+++ b/src/vision/layouts/diagramLayouts.json
@@ -1,25 +1,25 @@
 {
-  "missions": {
+  "components": {
     "name": "Missions",
     "queries": {
-      "missions": "missions-diagram.sparql",
-      "edge": "objectives-edge.sparql"
+      "connections": "components.sparql",
+      "edge": "components.sparql"
     },
     "rowMapping": {
-      "id": "missions",
-      "name": "Missions",
-      "labelFormat": "{m_id} {m_name}",
-      "colorKey": "m_id",
-      "edgeMatchKey": "m_id"
+      "id": "connections",
+      "name": "Components",
+      "labelFormat": "{c1_id} {c1_name}",
+      "colorKey": "c1_name",
+      "edgeMatchKey": "c1_id"
     },
     "edges": [
       {
         "id": "edge",
-        "name": "Objective",
-        "labelFormat": "{o_name}",
-        "colorKey": "o_id",
-        "sourceKey": "o_id",
-        "targetKey": "m_id"
+        "name": "Components",
+        "labelFormat": "contains",
+        "colorKey": "c1_name",
+        "sourceKey": "c2_id",
+        "targetKey": "c1_id"
       }
     ]
   }
diff --git a/src/vision/layouts/pages.json b/src/vision/layouts/pages.json
index e360ee7..7261eb1 100644
--- a/src/vision/layouts/pages.json
+++ b/src/vision/layouts/pages.json
@@ -12,15 +12,15 @@
       },
       {
         "title": "Missions",
-        "treeIcon": "graph-scatter",
+        "treeIcon": "list-tree",
         "path": "missions",
-        "isDiagram": true
+        "isTree": true
       },
       {
         "title": "Components",
-        "treeIcon": "list-tree",
+        "treeIcon": "graph-scatter",
         "path": "components",
-        "isTree": true
+        "isDiagram": true
       },
       {
         "title": "Connections",
diff --git a/src/vision/layouts/treeLayouts.json b/src/vision/layouts/treeLayouts.json
index 0043f59..3f17377 100644
--- a/src/vision/layouts/treeLayouts.json
+++ b/src/vision/layouts/treeLayouts.json
@@ -20,23 +20,24 @@
       ]
     }
   },
-  "components": {
-    "name": "Components",
+  "missions": {
+    "name": "Missions",
     "diagrams": {
-      "all-rows": "components-diagram"
+      "all-rows": "missions-diagram"
     },
     "queries": {
-      "components": "components.sparql"
+      "missions": "missions.sparql",
+      "objectives": "missions.sparql"
     },
     "rowMapping": {
-      "id": "components",
-      "name": "Components",
-      "labelFormat": "{c1_id} {c1_name}",
+      "id": "missions",
+      "name": "Missions",
+      "labelFormat": "{m_id} {m_name}",
       "subRowMappings": [
         {
-          "id": "components",
-          "name": "Masses",
-          "labelFormat": "{c1_mass}"
+          "id": "objectives",
+          "name": "Objectives",
+          "labelFormat": "{o_name}"
         }
       ]
     }