diff --git a/src/components.d.ts b/src/components.d.ts
index 534c46f..ce43e6e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -10,7 +10,9 @@ declare module 'vue' {
     AnnotationPopup: typeof import('./components/Tooltip/AnnotationPopup.vue')['default']
     ConnectionDialog: typeof import('./components/DrawToolbar/ConnectionDialog.vue')['default']
     ConnectivityGraph: typeof import('./components/ConnectivityGraph/ConnectivityGraph.vue')['default']
+    ConnectivityGraphNew: typeof import('./components/ConnectivityGraph/ConnectivityGraphNew.vue')['default']
     ConnectivityList: typeof import('./components/ConnectivityList/ConnectivityList.vue')['default']
+    ConnectivityListNew: typeof import('./components/ConnectivityList/ConnectivityListNew.vue')['default']
     CopyToClipboard: typeof import('./components/CopyToClipboard/CopyToClipboard.vue')['default']
     CreateTooltipContent: typeof import('./components/Tooltip/CreateTooltipContent.vue')['default']
     DrawToolbar: typeof import('./components/DrawToolbar/DrawToolbar.vue')['default']
diff --git a/src/components/CompetencyQueries/CompetencyQueries.js b/src/components/CompetencyQueries/CompetencyQueries.js
index b2d21b5..3215786 100644
--- a/src/components/CompetencyQueries/CompetencyQueries.js
+++ b/src/components/CompetencyQueries/CompetencyQueries.js
@@ -1,3 +1,5 @@
+import { removeDuplicates } from '../utilities';
+
 /**
  * @private
  * Competency Queries
@@ -28,6 +30,54 @@ async function _postRequest(API_URL, payload) {
   }
 }
 
+/**
+ * CQ query 27: Single Connectivity List
+ * @param {*} flatmapAPI
+ * @param {*} knowledgeSource mapuuid
+ * @param {*} pathId
+ * @returns combined connectivity list
+ */
+async function querySingleConnectivityList(flatmapAPI, knowledgeSource, pathId) {
+  const data = await competencyQuery({
+    flatmapAPI: flatmapAPI,
+    knowledgeSource: knowledgeSource,
+    queryId: 27,
+    parameters: [
+      {
+        column: 'path_id',
+        value: pathId
+      },
+    ]
+  });
+
+  if (data?.results?.values) {
+    const connectivityList = data.results.values.map((value) => {
+      // value => [
+      // "sckan_id",
+      // "path_id",
+      // "sckan_node_id",
+      // "sckan_node_label",
+      // "source_id", // mapuuid
+      // "node_id", // map node id
+      // "node_label" // map node label
+      // ]
+      return {
+        sckanId: value[0],
+        mapUUID: value[4],
+        pathId: value[1],
+        sckanNodeId: value[2] ? JSON.parse(value[2]) : [],
+        sckanNodeLabel: value[3] || "",
+        mapNodeId: value[5] ? JSON.parse(value[5]) : [],
+        mapNodeLabel: value[6] || "",
+      };
+    });
+    // remove duplicates
+    return removeDuplicates(connectivityList);
+  }
+
+  return [];
+}
+
 /**
  * Competency Query
  * @public
@@ -392,4 +442,5 @@ export {
   queryPathsByDestination,
   queryPathsByRoute,
   queryForwardBackwardConnections,
+  querySingleConnectivityList,
 };
diff --git a/src/components/ConnectivityGraph/ConnectivityGraphNew.vue b/src/components/ConnectivityGraph/ConnectivityGraphNew.vue
new file mode 100644
index 0000000..153d57c
--- /dev/null
+++ b/src/components/ConnectivityGraph/ConnectivityGraphNew.vue
@@ -0,0 +1,727 @@
+<template>
+  <div class="connectivity-graph" v-loading="loading" ref="connectivityGraphRef">
+
+    <div ref="graphCanvas" class="graph-canvas"></div>
+
+    <div class="control-panel control-panel-tools">
+      <div class="tools" :class="{'zoom-locked': zoomEnabled}">
+        <el-tooltip
+          :content="resetLabel"
+          placement="top"
+          effect="control-tooltip"
+          :teleported="true"
+          :append-to="connectivityGraphContainer"
+        >
+          <el-button
+            class="control-button"
+            size="small"
+            @click="reset"
+          >
+            <el-icon color="white">
+              <el-icon-aim />
+            </el-icon>
+            <span class="visually-hidden">{{ resetLabel }}</span>
+          </el-button>
+        </el-tooltip>
+
+        <el-tooltip
+          :content="zoomLockLabel"
+          placement="top"
+          effect="control-tooltip"
+          :teleported="true"
+          :append-to="connectivityGraphContainer"
+        >
+          <el-button
+            class="control-button"
+            size="small"
+            @click="toggleZoom"
+          >
+            <el-icon color="white">
+              <template v-if="zoomEnabled">
+                <el-icon-lock />
+              </template>
+              <template v-else>
+                <el-icon-unlock />
+              </template>
+            </el-icon>
+            <span class="visually-hidden">{{ zoomLockLabel }}</span>
+          </el-button>
+        </el-tooltip>
+
+        <el-tooltip
+          :content="zoomInLabel"
+          placement="left"
+          effect="control-tooltip"
+          :teleported="true"
+          :append-to="connectivityGraphContainer"
+        >
+          <el-button
+            class="control-button"
+            size="small"
+            @click="zoomIn"
+          >
+            <el-icon color="white">
+              <el-icon-zoom-in />
+            </el-icon>
+            <span class="visually-hidden">{{ zoomInLabel }}</span>
+          </el-button>
+        </el-tooltip>
+
+        <el-tooltip
+          :content="zoomOutLabel"
+          placement="left"
+          effect="control-tooltip"
+          :teleported="true"
+          :append-to="connectivityGraphContainer"
+        >
+          <el-button
+            class="control-button"
+            size="small"
+            @click="zoomOut"
+          >
+            <el-icon color="white">
+              <el-icon-zoom-out />
+            </el-icon>
+            <span class="visually-hidden">{{ zoomOutLabel }}</span>
+          </el-button>
+        </el-tooltip>
+      </div>
+    </div>
+
+    <div class="control-panel control-panel-nodes">
+      <div class="node-key">
+        <!-- <div class="key-head">Node type:</div> -->
+        <div class="key-box-container">
+          <div class="key-box key-box-dendrite">
+            Origin
+          </div>
+          <div class="key-box key-box-node">
+            Components
+          </div>
+          <div class="key-box key-box-axon">
+            Destination
+          </div>
+          <!--
+          <div class="key-box key-box-both">
+            Both
+          </div>
+          -->
+        </div>
+      </div>
+    </div>
+
+    <div v-show="connectivityError.errorConnectivities" class="connectivity-graph-error">
+      <strong>{{ connectivityError.errorConnectivities }}</strong>
+      {{ connectivityError.errorMessage }}
+    </div>
+
+    <div v-if="loadingError" class="loading-error">
+      {{ loadingError }}
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { ConnectivityGraph } from './graph';
+
+const MIN_SCHEMA_VERSION = 1.3;
+const CACHE_LIFETIME = 24 * 60 * 60 * 1000; // One day
+const RESET_LABEL = 'Reset position';
+const ZOOM_LOCK_LABEL = 'Lock zoom';
+const ZOOM_UNLOCK_LABEL = 'Unlock zoom';
+const ZOOM_IN_LABEL = 'Zoom in';
+const ZOOM_OUT_LABEL = 'Zoom out';
+const ZOOM_INCREMENT = 0.25;
+const APP_PRIMARY_COLOR = '#8300bf';
+
+export default {
+  name: 'ConnectivityGraphNew',
+  props: {
+    /**
+     * Entity to load its connectivity graph.
+     */
+    entry: {
+      type: String,
+      default: '',
+    },
+    mapServer: {
+      type: String,
+      default: '',
+    },
+    sckanVersion: {
+      type: String,
+      default: '',
+    },
+    selectedConnectivityData: {
+      type: Array,
+      default: [],
+    },
+    connectivityFromMap: {
+      type: Object,
+      default: () => null,
+    },
+    connectivityError: {
+      type: Object,
+      default: () => {},
+    }
+  },
+  data: function () {
+    return {
+      loading: true,
+      loadingError: '',
+      connectivityGraph: null,
+      selectedSource: '',
+      availableSources: [],
+      pathList: [],
+      schemaVersion: '',
+      knowledgeByPath: new Map(),
+      labelledTerms: new Set(),
+      labelCache: new Map(),
+      resetLabel: RESET_LABEL,
+      zoomLockLabel: ZOOM_LOCK_LABEL,
+      zoomInLabel: ZOOM_IN_LABEL,
+      zoomOutLabel: ZOOM_OUT_LABEL,
+      iconColor: APP_PRIMARY_COLOR,
+      zoomEnabled: false,
+      connectivityGraphContainer: null,
+    };
+  },
+  watch: {
+    connectivityFromMap: function (oldVal, newVal) {
+      if (oldVal != newVal) {
+        this.showSpinner();
+        this.start();
+      }
+    }
+  },
+  mounted() {
+    this.showSpinner();
+    this.updateTooltipContainer();
+    this.refreshCache();
+    this.loadCacheData();
+    this.start();
+  },
+  methods: {
+    updateTooltipContainer: function () {
+      this.connectivityGraphContainer = this.$refs.connectivityGraphRef;
+    },
+    loadCacheData: function () {
+      const availableSources = sessionStorage.getItem('connectivity-graph-sources');
+      const labelCache = sessionStorage.getItem('connectivity-graph-labels');
+      const pathList = sessionStorage.getItem('connectivity-graph-pathlist');
+      const schemaVersion = sessionStorage.getItem('connectivity-graph-schema-version');
+
+      // Use provided SCKAN version for the knowledge source
+      if (this.sckanVersion) {
+        this.selectedSource = this.sckanVersion;
+      }
+      sessionStorage.setItem('connectivity-graph-selected-source', this.selectedSource);
+      this.updateCacheExpiry();
+
+      if (availableSources) {
+        this.availableSources = JSON.parse(availableSources);
+      }
+
+      if (pathList) {
+        this.pathList = JSON.parse(pathList);
+      }
+
+      if (labelCache) {
+        const labelCacheObj = JSON.parse(labelCache);
+        this.labelCache = new Map(Object.entries(labelCacheObj));
+      }
+
+      if (schemaVersion) {
+        this.schemaVersion = schemaVersion;
+      }
+    },
+    isValidKnowledgeSource: function () {
+      const selectedSource = sessionStorage.getItem('connectivity-graph-selected-source');
+      if (this.sckanVersion && (this.sckanVersion !== selectedSource)) {
+        return false;
+      }
+      return true;
+    },
+    removeAllCacheData: function () {
+      const keys = [
+        'connectivity-graph-expiry',
+        'connectivity-graph-selected-source',
+        'connectivity-graph-source', // to clear old data
+        'connectivity-graph-sources',
+        'connectivity-graph-labels',
+        'connectivity-graph-pathlist',
+        'connectivity-graph-schema-version',
+      ];
+      keys.forEach((key) => {
+        sessionStorage.removeItem(key);
+      });
+    },
+    refreshCache: function () {
+      const expiry = sessionStorage.getItem('connectivity-graph-expiry');
+      const now = new Date();
+      const validKnowledgeSource = this.isValidKnowledgeSource();
+
+      if (now.getTime() > expiry || !validKnowledgeSource) {
+        this.removeAllCacheData();
+      }
+    },
+    updateCacheExpiry: function () {
+      const now = new Date();
+      const expiry = now.getTime() + CACHE_LIFETIME;
+
+      sessionStorage.setItem('connectivity-graph-expiry', expiry);
+    },
+    start: function () {
+      this.run()
+        .then((res) => {
+          if (res?.success) {
+            this.showGraph(this.entry);
+          } else if (res?.error) {
+            this.loadingError = res.error;
+            this.hideSpinner();
+          } else {
+            this.loadingError = 'Loading error!';
+            this.hideSpinner();
+          }
+        })
+        .catch((error) => {
+          this.loadingError = 'Loading error!';
+          this.hideSpinner();
+        });
+    },
+    run: async function () {
+      if (!this.schemaVersion) {
+        this.schemaVersion = await this.getSchemaVersion();
+        sessionStorage.setItem('connectivity-graph-schema-version', this.schemaVersion);
+        this.updateCacheExpiry();
+      }
+      if (this.schemaVersion < MIN_SCHEMA_VERSION) {
+        return {
+          error: `No server available for schema-version ${this.schemaVersion}.`,
+        };
+      }
+
+      if (!this.availableSources.length) {
+        this.availableSources = await this.loadAvailableSources();
+      }
+
+      if (!this.connectivityFromMap && !this.isSCKANVersionAvailable()) {
+        return {
+          error: `No data available for SCKAN version ${this.selectedSource}.`,
+        };
+      }
+
+      await this.setPathList(this.selectedSource);
+      return {
+        success: true,
+      };
+    },
+    showGraph: async function (neuronPath) {
+      const graphCanvas = this.$refs.graphCanvas;
+
+      // Update label data
+      if (this.connectivityFromMap) {
+        this.cacheLabels(this.connectivityFromMap);
+        await this.getCachedTermLabels();
+      }
+
+      this.connectivityGraph = new ConnectivityGraph(this.labelCache, graphCanvas);
+      const connectivityInfo = this.knowledgeByPath.get(neuronPath);
+
+      // Update connectivity
+      if (this.connectivityFromMap) {
+        connectivityInfo.axons = this.connectivityFromMap.axons;
+        connectivityInfo.connectivity = this.connectivityFromMap.connectivity;
+        connectivityInfo.dendrites = this.connectivityFromMap.dendrites;
+        connectivityInfo.somas = this.connectivityFromMap.somas;
+      }
+
+      await this.connectivityGraph.addConnectivity(connectivityInfo);
+
+      this.connectivityGraph.showConnectivity(graphCanvas);
+
+      // saved state from list view
+      if (this.selectedConnectivityData.length) {
+        this.connectivityGraph.selectConnectivity(this.selectedConnectivityData);
+      }
+
+      this.connectivityGraph.on('tap-node', (event) => {
+        const data = event.detail;
+        /**
+         * This event is triggered after a node on the connectivity graph is clicked.
+         */
+        this.$emit('tap-node', data);
+      });
+
+      this.hideSpinner();
+    },
+    query: async function (sql, params) {
+      const url = `${this.mapServer}knowledge/query/`;
+      const query = { sql, params };
+
+      try {
+        const response = await fetch(url, {
+          method: 'POST',
+          headers: {
+            "Accept": "application/json; charset=utf-8",
+            "Cache-Control": "no-store",
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(query)
+        });
+
+        if (!response.ok) {
+          throw new Error(`Cannot access ${url}`);
+        }
+
+        return await response.json();
+      } catch {
+        return {
+          values: []
+        };
+      }
+    },
+    isSCKANVersionAvailable: function () {
+      return this.availableSources.includes(this.selectedSource);
+    },
+    loadAvailableSources: async function () {
+      const data = await this.getJsonData(`${this.mapServer}knowledge/sources`);
+      const sources = data ? (data.sources || []) : [];
+      const filteredSources = sources.filter((source) => source); // filter null values
+      sessionStorage.setItem('connectivity-graph-sources', JSON.stringify(filteredSources));
+      this.updateCacheExpiry();
+      return filteredSources;
+    },
+    loadPathData: async function (source) {
+      const data = await this.query(
+        `select entity, knowledge from knowledge
+          where entity like 'ilxtr:%' and source=?
+          order by entity`,
+        [source]);
+      const pathList = data ? data.values : [];
+      return pathList;
+    },
+    setPathList: async function (source) {
+      if (!this.pathList.length) {
+        this.pathList = await this.loadPathData(source);
+        sessionStorage.setItem('connectivity-graph-pathlist', JSON.stringify(this.pathList));
+        this.updateCacheExpiry();
+      }
+
+      this.knowledgeByPath.clear();
+      this.labelledTerms = new Set();
+
+      for (const [key, jsonKnowledge] of this.pathList) {
+        const knowledge = JSON.parse(jsonKnowledge);
+        if ('connectivity' in knowledge) {
+          this.knowledgeByPath.set(key, knowledge);
+          this.cacheLabels(knowledge);
+        }
+      }
+
+      if (!this.labelCache.size) {
+        await this.getCachedTermLabels();
+      }
+
+      return '';
+    },
+    getSchemaVersion: async function () {
+      const data = await this.getJsonData(`${this.mapServer}knowledge/schema-version`);
+      return data ? (+data.version || 0) : 0;
+    },
+    getJsonData: async function (url) {
+      try {
+        const response = await fetch(url, {
+          method: 'GET',
+          headers: {
+            "Accept": "application/json; charset=utf-8",
+            "Cache-Control": "no-store",
+            "Content-Type": "application/json"
+          }
+        });
+
+        if (!response.ok) {
+          console.error(`Cannot access ${url}`);
+        }
+
+        return await response.json();
+      } catch {
+        return null;
+      }
+    },
+    getCachedTermLabels: async function () {
+      if (this.labelledTerms.size) {
+        const data = await this.query(
+          `select entity, knowledge from knowledge
+            where entity in (?${', ?'.repeat(this.labelledTerms.size-1)})
+            order by source desc`,
+          [...this.labelledTerms.values()]
+        );
+
+        let last_entity = null;
+        for (const [key, jsonKnowledge] of data.values) {
+          if (key !== last_entity) {
+            const knowledge = JSON.parse(jsonKnowledge);
+            this.labelCache.set(key, knowledge['label'] || key);
+            last_entity = key;
+          }
+        }
+
+        const labelCacheObj = Object.fromEntries(this.labelCache);
+        sessionStorage.setItem('connectivity-graph-labels', JSON.stringify(labelCacheObj));
+        this.updateCacheExpiry();
+      }
+    },
+    cacheNodeLabels: function (node) {
+      for (const term of [node[0], ...node[1]]) {
+        this.labelledTerms.add(term);
+      }
+    },
+    cacheLabels: async function (knowledge) {
+      for (const edge of knowledge.connectivity) {
+        this.cacheNodeLabels(edge[0]);
+        this.cacheNodeLabels(edge[1]);
+      }
+    },
+    showSpinner: function () {
+      this.loading = true;
+    },
+    hideSpinner: function () {
+      this.loading = false;
+    },
+    reset: function () {
+      this.connectivityGraph.reset();
+    },
+    zoomIn: function () {
+      this.connectivityGraph.zoom(ZOOM_INCREMENT);
+    },
+    zoomOut: function () {
+      this.connectivityGraph.zoom(-ZOOM_INCREMENT);
+    },
+    /**
+     * Enable/disable user zoom for scrolling
+     */
+    toggleZoom: function () {
+      this.zoomEnabled = !this.zoomEnabled;
+      this.zoomLockLabel = this.zoomEnabled ? ZOOM_UNLOCK_LABEL : ZOOM_LOCK_LABEL;
+      this.connectivityGraph.enableZoom(!this.zoomEnabled);
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.connectivity-graph,
+.graph-canvas {
+  width: 100%;
+  height: 600px;
+  background-color: white;
+  position: relative;
+}
+
+.connectivity-graph {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+  border: solid 1px #e4e7ed;
+}
+
+.control-panel {
+  position: absolute;
+  right: 1rem;
+
+  &-tools {
+    top: 1rem;
+  }
+
+  &-nodes {
+    bottom: 1rem;
+  }
+}
+
+.node-key {
+  padding: 0.5rem;
+  font-size: 12px;
+  border: 1px solid var(--el-border-color);
+  background-color: rgba(#f7faff, 0.85);
+}
+
+.key-head {
+  text-align: center;
+  font-weight: bold;
+  border-bottom: 1px solid var(--el-border-color);
+  padding-bottom: 4px;
+  margin-bottom: 0.5rem;
+}
+
+.key-box-container {
+  display: flex;
+  flex-direction: row;
+  gap: 1rem;
+}
+
+.key-box {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  position: relative;
+  line-height: 1;
+
+  &::before {
+    content: "";
+    display: block;
+    width: 14px;
+    height: 14px;
+  }
+
+  &-node::before,
+  &-both::before {
+    border: 1px solid gray;
+    border-radius: var(--el-border-radius-small);
+  }
+
+  // &-node {
+  //   background: #80F0F0;
+  // }
+
+  // &-both {
+  //   background: gray;
+  // }
+
+  &-axon::before {
+    border: 1px solid gray;
+    border-radius: var(--el-border-radius-small);
+    transform: rotate(45deg);
+    // background: green;
+  }
+
+  &-dendrite::before {
+    border: 1px solid gray;
+    border-radius: 50%;
+    // background: red;
+  }
+}
+
+.tools {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(3, 1fr);
+  gap: 0.5rem;
+
+  :deep(.el-button:nth-child(3)) {
+    grid-column: 2;
+    grid-row: 2;
+  }
+
+  :deep(.el-button:nth-child(4)) {
+    grid-column: 2;
+    grid-row: 3;
+  }
+
+  :deep(.el-button:nth-child(3)),
+  :deep(.el-button:nth-child(4)) {
+    opacity: 0;
+    visibility: hidden;
+    pointer-events: none;
+    transform: translateY(-100%);
+    transition: all 0.25s ease;
+  }
+
+  &.zoom-locked {
+    :deep(.el-button:nth-child(3)),
+    :deep(.el-button:nth-child(4)) {
+      opacity: 1;
+      visibility: visible;
+      pointer-events: initial;
+      transform: translateY(0%);
+    }
+
+    :deep(.el-button:nth-child(4)) {
+      transition-delay: 0.125s;
+    }
+  }
+}
+
+.control-button {
+  width: 24px;
+  height: 24px;
+  margin: 0 !important;
+  padding: 0 !important;
+  font-size: 16px !important;
+  border-color: $app-primary-color !important;
+  border-radius: 50%;
+  background: $app-primary-color !important;
+  transition: all 0.25s ease;
+
+  svg {
+    margin: 0;
+  }
+
+  &,
+  &:focus,
+  &:active {
+    box-shadow: none !important;
+  }
+}
+
+:deep(.cy-graph-tooltip) {
+  padding: 4px 10px;
+  font-family: Asap;
+  font-size: 12px;
+  background: #f3ecf6 !important;
+  border: 1px solid $app-primary-color;
+  border-radius: var(--el-border-radius-base);
+  box-shadow: 1px 1px 6px 1px rgba($app-primary-color, 0.15);
+  position: relative;
+  top: 0;
+  left: 0;
+  width: fit-content;
+  z-index: 1;
+}
+
+.connectivity-graph-error {
+  position: absolute;
+  top: 1rem;
+  left: 50%;
+  transform: translateX(-50%);
+  width: fit-content;
+  font-size: 12px;
+  padding: 0.25rem 0.5rem;
+  background-color: var(--el-color-error-light-9);
+  border-radius: var(--el-border-radius-small);
+  border: 1px solid var(--el-color-error);
+}
+
+.visually-hidden {
+  clip: rect(0 0 0 0);
+  clip-path: inset(50%);
+  height: 1px;
+  overflow: hidden;
+  position: absolute;
+  white-space: nowrap;
+  width: 1px;
+}
+
+.loading-error {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: var(--el-mask-color);
+}
+</style>
+
+<style lang="scss">
+  .el-popper.is-control-tooltip {
+    padding: 4px 10px;
+    font-family: Asap;
+    background: #f3ecf6 !important;
+    border: 1px solid $app-primary-color;
+
+    & .el-popper__arrow::before {
+      border: 1px solid;
+      border-color: $app-primary-color;
+      background: #f3ecf6;
+    }
+  }
+</style>
diff --git a/src/components/ConnectivityList/ConnectivityList.vue b/src/components/ConnectivityList/ConnectivityList.vue
index 853684f..fac1ffd 100644
--- a/src/components/ConnectivityList/ConnectivityList.vue
+++ b/src/components/ConnectivityList/ConnectivityList.vue
@@ -19,172 +19,172 @@
         {{ connectivityError.errorMessage }}
       </template>
     </el-popover>
-      {{ entry.paths }}
-      <div v-if="origins && origins.length > 0" class="block">
-        <div class="attribute-title-container">
-          <span class="attribute-title">Origin</span>
-          <el-popover
-            width="250"
-            trigger="hover"
-            :teleported="false"
-            popper-class="popover-origin-help"
-          >
-            <template #reference>
-              <el-icon class="info"><el-icon-warning /></el-icon>
-            </template>
-            <span style="word-break: keep-all">
-              <i>Origin</i> {{ originDescription }}
-            </span>
-          </el-popover>
-        </div>
-        <div
-          v-for="(origin, i) in origins"
-          class="attribute-content"
-          :origin-item-label="origin"
-          :key="origin"
-          @mouseenter="onConnectivityHovered(origin, $event)"
-          @mouseleave="onConnectivityHovered()"
-        >
-          <el-popover
-            width="150"
-            trigger="hover"
-            :teleported="false"
-            popper-class="popover-origin-help"
-          >
-            <template #reference>
-              <el-icon
-                class="magnify-glass"
-                v-show="shouldShowMagnifyGlass(origin,)"
-                @click="onConnectivityClicked(origin)"
-              >
-                <el-icon-search />
-              </el-icon>
-            </template>
-            <span>Search connectivity</span>
-          </el-popover>
-          <span>{{ capitalise(origin) }}</span>
-        </div>
-        <el-button
-          v-show="
-            originsWithDatasets && originsWithDatasets.length > 0 &&
-            shouldShowExploreButton(originsWithDatasets)
-          "
-          class="button"
-          id="open-dendrites-button"
-          @click="openDendrites"
+    {{ entry.paths }}
+    <div v-if="origins && origins.length > 0" class="block">
+      <div class="attribute-title-container">
+        <span class="attribute-title">Origin</span>
+        <el-popover
+          width="250"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
         >
-          Explore origin data
-        </el-button>
+          <template #reference>
+            <el-icon class="info"><el-icon-warning /></el-icon>
+          </template>
+          <span style="word-break: keep-all">
+            <i>Origin</i> {{ originDescription }}
+          </span>
+        </el-popover>
       </div>
       <div
-        v-if="components && components.length > 0"
-        class="block"
+        v-for="(origin, i) in origins"
+        class="attribute-content"
+        :origin-item-label="origin"
+        :key="origin"
+        @mouseenter="onConnectivityHovered(origin, $event)"
+        @mouseleave="onConnectivityHovered()"
       >
-        <div class="attribute-title-container">
-          <span class="attribute-title">Components</span>
-        </div>
-        <div
-          v-for="(component, i) in components"
-          class="attribute-content"
-          :component-item-label="component"
-          :key="component"
-          @mouseenter="onConnectivityHovered(component, $event)"
-          @mouseleave="onConnectivityHovered()"
+        <el-popover
+          width="150"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
         >
-          <el-popover
-            width="150"
-            trigger="hover"
-            :teleported="false"
-            popper-class="popover-origin-help"
-          >
-            <template #reference>
-              <el-icon
-                class="magnify-glass"
-                v-show="shouldShowMagnifyGlass(component)"
-                @click="onConnectivityClicked(component)"
-              >
-                <el-icon-search />
-              </el-icon>
-            </template>
-            <span>Search connectivity</span>
-          </el-popover>
-          <span>{{ capitalise(component) }}</span>
-        </div>
+          <template #reference>
+            <el-icon
+              class="magnify-glass"
+              v-show="shouldShowMagnifyGlass(origin,)"
+              @click="onConnectivityClicked(origin)"
+            >
+              <el-icon-search />
+            </el-icon>
+          </template>
+          <span>Search connectivity</span>
+        </el-popover>
+        <span>{{ capitalise(origin) }}</span>
+      </div>
+      <el-button
+        v-show="
+          originsWithDatasets && originsWithDatasets.length > 0 &&
+          shouldShowExploreButton(originsWithDatasets)
+        "
+        class="button"
+        id="open-dendrites-button"
+        @click="openDendrites"
+      >
+        Explore origin data
+      </el-button>
+    </div>
+    <div
+      v-if="components && components.length > 0"
+      class="block"
+    >
+      <div class="attribute-title-container">
+        <span class="attribute-title">Components</span>
       </div>
       <div
-        v-if="destinations && destinations.length > 0"
-        class="block"
+        v-for="(component, i) in components"
+        class="attribute-content"
+        :component-item-label="component"
+        :key="component"
+        @mouseenter="onConnectivityHovered(component, $event)"
+        @mouseleave="onConnectivityHovered()"
       >
-        <div class="attribute-title-container">
-          <span class="attribute-title">Destination</span>
-          <el-popover
-            width="250"
-            trigger="hover"
-            :teleported="false"
-            popper-class="popover-origin-help"
-          >
-            <template #reference>
-              <el-icon class="info"><el-icon-warning /></el-icon>
-            </template>
-            <span style="word-break: keep-all">
-              <i>Destination</i> is where the axons terminate
-            </span>
-          </el-popover>
-        </div>
-        <div
-          v-for="(destination, i) in destinations"
-          class="attribute-content"
-          :destination-item-label="destination"
-          :key="destination"
-          @mouseenter="onConnectivityHovered(destination, $event)"
-          @mouseleave="onConnectivityHovered()"
+        <el-popover
+          width="150"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
         >
-          <el-popover
-            width="150"
-            trigger="hover"
-            :teleported="false"
-            popper-class="popover-origin-help"
-          >
-            <template #reference>
-              <el-icon
-                class="magnify-glass"
-                v-show="shouldShowMagnifyGlass(destination)"
-                @click="onConnectivityClicked(destination)"
-              >
-                <el-icon-search />
-              </el-icon>
-            </template>
-            <span>Search connectivity</span>
-          </el-popover>
-          <span>{{ capitalise(destination) }}</span>
-        </div>
-        <el-button
-          v-show="
-            destinationsWithDatasets &&
-            destinationsWithDatasets.length > 0 &&
-            shouldShowExploreButton(destinationsWithDatasets)
-          "
-          class="button"
-          @click="openAxons"
+          <template #reference>
+            <el-icon
+              class="magnify-glass"
+              v-show="shouldShowMagnifyGlass(component)"
+              @click="onConnectivityClicked(component)"
+            >
+              <el-icon-search />
+            </el-icon>
+          </template>
+          <span>Search connectivity</span>
+        </el-popover>
+        <span>{{ capitalise(component) }}</span>
+      </div>
+    </div>
+    <div
+      v-if="destinations && destinations.length > 0"
+      class="block"
+    >
+      <div class="attribute-title-container">
+        <span class="attribute-title">Destination</span>
+        <el-popover
+          width="250"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
         >
-          Explore destination data
-        </el-button>
+          <template #reference>
+            <el-icon class="info"><el-icon-warning /></el-icon>
+          </template>
+          <span style="word-break: keep-all">
+            <i>Destination</i> is where the axons terminate
+          </span>
+        </el-popover>
       </div>
       <div
-        v-show="
-          componentsWithDatasets &&
-          componentsWithDatasets.length > 0 &&
-          shouldShowExploreButton(componentsWithDatasets)
-        "
-        class="block"
+        v-for="(destination, i) in destinations"
+        class="attribute-content"
+        :destination-item-label="destination"
+        :key="destination"
+        @mouseenter="onConnectivityHovered(destination, $event)"
+        @mouseleave="onConnectivityHovered()"
       >
-        <el-button
-          class="button"
-          @click="openAll"
+        <el-popover
+          width="150"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
         >
-          Search for data on components
-        </el-button>
+          <template #reference>
+            <el-icon
+              class="magnify-glass"
+              v-show="shouldShowMagnifyGlass(destination)"
+              @click="onConnectivityClicked(destination)"
+            >
+              <el-icon-search />
+            </el-icon>
+          </template>
+          <span>Search connectivity</span>
+        </el-popover>
+        <span>{{ capitalise(destination) }}</span>
       </div>
+      <el-button
+        v-show="
+          destinationsWithDatasets &&
+          destinationsWithDatasets.length > 0 &&
+          shouldShowExploreButton(destinationsWithDatasets)
+        "
+        class="button"
+        @click="openAxons"
+      >
+        Explore destination data
+      </el-button>
+    </div>
+    <div
+      v-show="
+        componentsWithDatasets &&
+        componentsWithDatasets.length > 0 &&
+        shouldShowExploreButton(componentsWithDatasets)
+      "
+      class="block"
+    >
+      <el-button
+        class="button"
+        @click="openAll"
+      >
+        Search for data on components
+      </el-button>
+    </div>
   </div>
 </template>
 
diff --git a/src/components/ConnectivityList/ConnectivityListNew.vue b/src/components/ConnectivityList/ConnectivityListNew.vue
new file mode 100644
index 0000000..ace5d21
--- /dev/null
+++ b/src/components/ConnectivityList/ConnectivityListNew.vue
@@ -0,0 +1,666 @@
+<template>
+  <div ref="connectivityList" class="connectivity-list">
+    <!-- Error Popover -->
+    <el-popover
+      width="250"
+      :show-arrow="false"
+      trigger="manual"
+      :teleported="false"
+      placement="bottom-start"
+      :visible="connectivityError.hasError && !!connectivityError.errorMessage"
+      :popper-class="connectivityError.errorType === 'warning' ? 'connectivity-warning-container' : 'connectivity-error-container'"
+    >
+      <template #reference>
+        <div class="connectivity-alert"
+          :style="{ top: alertTop + 'px', left: alertLeft + 'px' }">
+        </div>
+      </template>
+      <template #default>
+        <span v-html="connectivityError.errorMessage"></span>
+      </template>
+    </el-popover>
+
+    <!-- Origins -->
+    <div v-if="origins && originsCombinations.length > 0" class="block">
+      <div class="attribute-title-container">
+        <span class="attribute-title">Origin</span>
+        <el-popover
+          width="250"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
+        >
+          <template #reference>
+            <el-icon class="info"><el-icon-warning /></el-icon>
+          </template>
+          <span style="word-break: keep-all">
+            <i>Origin</i> {{ originDescription }}
+          </span>
+        </el-popover>
+      </div>
+      <div
+        v-for="(origin, i) in processedOriginsCombinations"
+        class="attribute-content"
+        :origin-item-label="origin.mapLabel"
+        :key="origin.mapLabel + '-' + i"
+        @mouseenter="onConnectivityHovered(origin, $event)"
+        @mouseleave="onConnectivityHovered()"
+      >
+        <el-popover
+          width="150"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
+        >
+          <template #reference>
+            <el-icon
+              class="magnify-glass"
+              v-show="origin.mapLabel"
+              @click="onConnectivityClicked(origin.mapLabel)"
+            >
+              <el-icon-search />
+            </el-icon>
+          </template>
+          <span>Search connectivity</span>
+        </el-popover>
+        <span>{{ capitalise(origin.mapLabel) }}</span>
+        <span v-if="origin.isUnmapped">
+          <span v-if="origin.mapLabel"> / </span>
+          <s>{{ capitalise(origin.sckanLabel) }}</s>
+        </span>
+      </div>
+      <el-button
+        v-show="
+          originsWithDatasets && originsWithDatasets.length > 0 &&
+          shouldShowExploreButton(originsWithDatasets)
+        "
+        class="button"
+        id="open-dendrites-button"
+        @click="openDendrites"
+      >
+        Explore origin data
+      </el-button>
+    </div>
+
+    <!-- Components -->
+    <div
+      v-if="components && componentsCombinations.length > 0"
+      class="block"
+    >
+      <div class="attribute-title-container">
+        <span class="attribute-title">Components</span>
+      </div>
+      <div
+        v-for="(component, i) in processedComponentsCombinations"
+        class="attribute-content"
+        :component-item-label="component.mapLabel"
+        :key="component.mapLabel + '-' + i"
+        @mouseenter="onConnectivityHovered(component, $event)"
+        @mouseleave="onConnectivityHovered()"
+      >
+        <el-popover
+          width="150"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
+        >
+          <template #reference>
+            <el-icon
+              class="magnify-glass"
+              v-show="component.mapLabel"
+              @click="onConnectivityClicked(component.mapLabel)"
+            >
+              <el-icon-search />
+            </el-icon>
+          </template>
+          <span>Search connectivity</span>
+        </el-popover>
+        <span>{{ capitalise(component.mapLabel) }}</span>
+        <span v-if="component.isUnmapped">
+          <span v-if="component.mapLabel"> / </span>
+          <s>{{ capitalise(component.sckanLabel) }}</s>
+        </span>
+      </div>
+    </div>
+
+    <!-- Destinations -->
+    <div
+      v-if="destinations && destinationsCombinations.length > 0"
+      class="block"
+    >
+      <div class="attribute-title-container">
+        <span class="attribute-title">Destination</span>
+        <el-popover
+          width="250"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
+        >
+          <template #reference>
+            <el-icon class="info"><el-icon-warning /></el-icon>
+          </template>
+          <span style="word-break: keep-all">
+            <i>Destination</i> is where the axons terminate
+          </span>
+        </el-popover>
+      </div>
+      <div
+        v-for="(destination, i) in processedDestinationsCombinations"
+        class="attribute-content"
+        :destination-item-label="destination.mapLabel"
+        :key="destination.mapLabel + '-' + i"
+        @mouseenter="onConnectivityHovered(destination, $event)"
+        @mouseleave="onConnectivityHovered()"
+      >
+        <el-popover
+          width="150"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
+        >
+          <template #reference>
+            <el-icon
+              class="magnify-glass"
+              v-show="destination.mapLabel"
+              @click="onConnectivityClicked(destination.mapLabel)"
+            >
+              <el-icon-search />
+            </el-icon>
+          </template>
+          <span>Search connectivity</span>
+        </el-popover>
+        <span>{{ capitalise(destination.mapLabel) }}</span>
+        <span v-if="destination.isUnmapped">
+          <span v-if="destination.mapLabel"> / </span>
+          <s>{{ capitalise(destination.sckanLabel) }}</s>
+        </span>
+      </div>
+      <el-button
+        v-show="
+          destinationsWithDatasets &&
+          destinationsWithDatasets.length > 0 &&
+          shouldShowExploreButton(destinationsWithDatasets)
+        "
+        class="button"
+        @click="openAxons"
+      >
+        Explore destination data
+      </el-button>
+    </div>
+
+    <!-- Explore Button -->
+    <div
+      v-show="
+        componentsWithDatasets &&
+        componentsWithDatasets.length > 0 &&
+        shouldShowExploreButton(componentsWithDatasets)
+      "
+      class="block"
+    >
+      <el-button
+        class="button"
+        @click="openAll"
+      >
+        Search for data on components
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  Warning as ElIconWarning,
+  Search as ElIconSearch,
+} from '@element-plus/icons-vue'
+import {
+  ElButton as Button,
+  ElContainer as Container,
+  ElIcon as Icon,
+} from 'element-plus'
+import { capitalise } from '../utilities'
+
+export default {
+  name: 'ConnectivityListNew',
+  components: {
+    Button,
+    Container,
+    Icon,
+    ElIconWarning,
+    ElIconSearch
+  },
+  props: {
+    entry: {
+      type: Object,
+      default: () => ({
+        destinations: [],
+        origins: [],
+        components: [],
+        destinationsWithDatasets: [],
+        originsWithDatasets: [],
+        componentsWithDatasets: [],
+        destinationsCombinations: [],
+        originsCombinations: [],
+        componentsCombinations: [],
+        resource: undefined,
+        featuresAlert: undefined,
+      }),
+    },
+    origins: {
+      type: Array,
+      default: () => []
+    },
+    components: {
+      type: Array,
+      default: () => []
+    },
+    destinations: {
+      type: Array,
+      default: () => []
+    },
+    originsWithDatasets: {
+      type: Array,
+      default: () => []
+    },
+    componentsWithDatasets: {
+      type: Array,
+      default: () => []
+    },
+    destinationsWithDatasets: {
+      type: Array,
+      default: () => []
+    },
+    componentsCombinations: {
+      type: Array,
+      default: () => []
+    },
+    originsCombinations: {
+      type: Array,
+      default: () => []
+    },
+    destinationsCombinations: {
+      type: Array,
+      default: () => []
+    },
+    availableAnatomyFacets: {
+      type: Array,
+      default: () => [],
+    },
+    connectivityError: {
+      type: Object,
+      default: () => {},
+    }
+  },
+  data: function () {
+    return {
+      alertTop: 0,
+      alertLeft: 0,
+      originDescriptions: {
+        motor: 'is the location of the initial cell body of the circuit',
+        sensory: 'is the location of the initial cell body in the PNS circuit',
+      },
+      facetList: [],
+      clearErrorTimeout: null,
+    }
+  },
+  watch: {
+    availableAnatomyFacets: {
+      handler: function (val) {
+        this.convertFacetsToList(val)
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
+  computed: {
+    originDescription: function () {
+      if (
+        this.entry &&
+        this.entry.title &&
+        this.entry.title.toLowerCase().includes('motor')
+      ) {
+        return this.originDescriptions.motor
+      } else {
+        return this.originDescriptions.sensory
+      }
+    },
+    // Deduplicate origins by mapId and collect mapped SCKAN labels
+    processedOriginsCombinations: function () {
+      return this.processCombinations(this.originsCombinations)
+    },
+    // Deduplicate destinations by mapId and collect mapped SCKAN labels
+    processedDestinationsCombinations: function () {
+      return this.processCombinations(this.destinationsCombinations)
+    },
+    // Deduplicate components by mapId and collect mapped SCKAN labels
+    processedComponentsCombinations: function () {
+      return this.processCombinations(this.componentsCombinations)
+    },
+  },
+  methods: {
+    capitalise: function (text) {
+      return capitalise(text)
+    },
+    // Process combinations to deduplicate by mapId and collect mapped SCKAN labels
+    processCombinations: function (combinations) {
+      const mapIdToItem = new Map()
+      const unmappedItems = []
+
+      combinations.forEach((combo) => {
+        // Items without mapId are considered unmapped (not available on map)
+        if (!combo.mapId || combo.mapId.length === 0) {
+          unmappedItems.push({
+            mapId: combo.mapId,
+            mapLabel: combo.mapLabel,
+            sckanLabel: combo.sckanLabel,
+            sckanId: combo.sckanId,
+            mappedSckanLabels: [],
+            isUnmapped: true,
+          })
+          return
+        }
+
+        const mapIdKey = JSON.stringify(combo.mapId)
+
+        if (!mapIdToItem.has(mapIdKey)) {
+          mapIdToItem.set(mapIdKey, {
+            mapId: combo.mapId,
+            mapLabel: combo.mapLabel,
+            sckanLabel: combo.sckanLabel,
+            sckanId: combo.sckanId,
+            mappedSckanLabels: [],
+            isUnmapped: false,
+          })
+        }
+
+        const item = mapIdToItem.get(mapIdKey)
+
+        // Collect all SCKAN labels mapped to this map item
+        // Avoid duplicates in mappedSckanLabels
+        if (!item.mappedSckanLabels.includes(combo.sckanLabel)) {
+          item.mappedSckanLabels.push(combo.sckanLabel)
+        }
+      })
+
+      // Return mapped items followed by unmapped items
+      return [...Array.from(mapIdToItem.values()), ...unmappedItems]
+    },
+    onConnectivityHovered: function (combination, event) {
+      if (this.clearErrorTimeout) {
+        clearTimeout(this.clearErrorTimeout);
+        this.clearErrorTimeout = null;
+      }
+
+      // Compute the new error state first
+      let newError = { hasError: false, errorType: '', errorMessage: '' };
+
+      if (combination) {
+        if (combination.mapId.length) {
+          // If there is mapId, it exists on the map.
+          // Show hover highlight on the map.
+          const hoveredLabel = combination.mapLabel.toLowerCase();
+          this.$emit('connectivity-hovered', hoveredLabel);
+
+          // If there are mapped SCKAN labels, show them in a list
+          if (combination.mappedSckanLabels && combination.mappedSckanLabels.length > 0) {
+            const sckanList = combination.mappedSckanLabels
+              .map(label => `<li>${label}</li>`)
+              .join('');
+            const messageHead = `<em>Mapped from these SCKAN entries:</em>`;
+            const messageBody = `<ul>${sckanList}</ul>`;
+            newError = {
+              hasError: true,
+              errorType: 'warning',
+              errorMessage: `${messageHead}${messageBody}`,
+            };
+          }
+          // If the SCKAN term and the Map term are different, show warning message.
+          else if (JSON.stringify(combination.sckanId) !== JSON.stringify(combination.mapId)) {
+            newError = {
+              hasError: true,
+              errorType: 'warning',
+              errorMessage: `<strong>${combination.sckanLabel}</strong> from the SCKAN
+                            has been mapped to <strong>${combination.mapLabel}</strong> on the Map.`,
+            };
+          }
+        } else if (combination.sckanId.length) {
+          // If there is no mapId but there is sckanId,
+          // it means the SCKAN term is not available on the Map.
+          newError = {
+            hasError: true,
+            errorType: 'error',
+            errorMessage: `<strong>${combination.sckanLabel}</strong> from the SCKAN
+                          is not available on the Map.`,
+          };
+        }
+      }
+
+      if (newError.hasError) {
+        // Show new error immediately with content
+        this.connectivityError.errorType = newError.errorType;
+        this.connectivityError.errorMessage = newError.errorMessage;
+        this.connectivityError.hasError = true;
+      } else {
+        // Hide the popover immediately, then clear content after transition (~300ms)
+        // so the popover fades out with content still visible (not as empty box)
+        this.connectivityError.hasError = false;
+        this.clearErrorTimeout = setTimeout(() => {
+          this.connectivityError.errorType = '';
+          this.connectivityError.errorMessage = '';
+          this.clearErrorTimeout = null;
+        }, 350);
+      }
+
+      if (event) {
+        const element = event.srcElement || event.target;
+        const rect = element.getBoundingClientRect();
+        const x = event.clientX - rect.left; // use mouse position relative to the element
+
+        this.alertTop = element.offsetParent.offsetTop + element.offsetTop;
+        this.alertLeft = x;
+      }
+    },
+    onConnectivityClicked: function (name) {
+      const connectivity = this.connectivityError.errorConnectivities;
+      // Remove the invalid term while searching
+      const label = connectivity
+        ? name.replace(new RegExp(`\\s*,?\\s*${connectivity}\\s*,?\\s*`, 'gi'), '').trim()
+        : name;
+      this.$emit('connectivity-clicked', label);
+    },
+    // shouldShowMagnifyGlass: Checks whether the hovered terms contain valid term or not
+    shouldShowMagnifyGlass: function (features) {
+      const connectivity = this.connectivityError.errorConnectivities;
+      return connectivity?.toLowerCase() !== features.toLowerCase();
+    },
+    // shouldShowExploreButton: Checks if the feature is in the list of available anatomy facets
+    shouldShowExploreButton: function (features) {
+      // facetList will not be available when there has no Sidebar's data
+      if (!this.facetList.length) {
+        return true
+      }
+      for (let i = 0; i < features.length; i++) {
+        if (this.facetList.includes(features[i].name.toLowerCase())) {
+          return true
+        }
+      }
+      return false
+    },
+    // convertFacetsToList: Converts the available anatomy facets to a list for easy searching
+    convertFacetsToList: function (facets) {
+      facets.forEach((facet) => {
+        if(facet.children) {
+          this.convertFacetsToList(facet.children)
+        } else {
+          this.facetList.push(facet.label.toLowerCase())
+        }
+      })
+    },
+    openAll: function () {
+      this.$emit('connectivity-action-click', {
+        type: 'Facets',
+        labels: this.componentsWithDatasets.map((a) => a.name.toLowerCase()),
+      })
+    },
+    openAxons: function () {
+      this.$emit('connectivity-action-click', {
+        type: 'Facets',
+        labels: this.destinationsWithDatasets.map((a) => a.name.toLowerCase()),
+      })
+    },
+    openDendrites: function () {
+      this.$emit('connectivity-action-click', {
+        type: 'Facets',
+        labels: this.originsWithDatasets.map((a) => a.name.toLowerCase()),
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.connectivity-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  position: relative;
+}
+
+.button {
+  margin-left: 0px !important;
+  margin-top: 0px !important;
+  font-size: 14px !important;
+  background-color: $app-primary-color;
+  color: #fff;
+
+  &:hover {
+    color: #fff !important;
+    background-color: #ac76c5 !important;
+    border: 1px solid #ac76c5 !important;
+  }
+
+  & + .button {
+    margin-top: 10px !important;
+  }
+}
+
+.icon {
+  right: 0px;
+  position: absolute;
+  top: 10px;
+}
+
+.icon:hover {
+  cursor: pointer;
+}
+
+:deep(.popover-origin-help.el-popover) {
+  text-transform: none !important; // need to overide the tooltip text transform
+  border: 1px solid $app-primary-color;
+  font-weight: 400;
+  font-family: Asap, sans-serif, Helvetica;
+
+  .el-popper__arrow {
+    &:before {
+      border-color: $app-primary-color;
+      background-color: #ffffff;
+    }
+  }
+}
+
+.info {
+  color: #8300bf;
+  transform: rotate(180deg);
+  margin-left: 8px;
+}
+
+.attribute-title-container {
+  margin-bottom: 0.5em;
+}
+
+.attribute-title {
+  font-size: 16px;
+  font-weight: 600;
+  /* font-weight: bold; */
+  text-transform: uppercase;
+}
+
+.attribute-content {
+  font-size: 14px;
+  font-weight: 500;
+  transition: color 0.25s ease;
+  position: relative;
+  cursor: default;
+  padding-left: 16px;
+
+  .magnify-glass {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+
+  &:hover {
+    color: $app-primary-color;
+
+    .magnify-glass {
+      display: block;
+      padding-top: 4px;
+      cursor: pointer;
+    }
+  }
+
+  + .attribute-content {
+    &::before {
+      content: "";
+      width: 90%;
+      height: 1px;
+      background-color: var(--el-border-color);
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+  }
+
+  &:last-of-type {
+    margin-bottom: 0.5em;
+  }
+}
+
+.connectivity-alert {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+}
+
+.connectivity-list :deep(.connectivity-error-container.el-popover),
+.connectivity-list :deep(.connectivity-warning-container.el-popover) {
+  min-height: 31px; // placeholder
+  align-items: center;
+  justify-content: center;
+  padding: 0.25rem 0.5rem;
+  border-radius: var(--el-border-radius-small);
+  pointer-events: none;
+  word-break: break-word;
+}
+
+.connectivity-list :deep(.connectivity-error-container.el-popover ul),
+.connectivity-list :deep(.connectivity-warning-container.el-popover ul) {
+  margin: 0.5em 0 0;
+  padding-left: 1.25em;
+}
+
+.connectivity-list :deep(.connectivity-error-container.el-popover li + li),
+.connectivity-list :deep(.connectivity-warning-container.el-popover li + li) {
+  margin-top: 0.25em;
+}
+
+.connectivity-list :deep(.connectivity-error-container.el-popover) {
+  background-color: var(--el-color-error-light-9);
+  border: 1px solid var(--el-color-error);
+}
+
+.connectivity-list :deep(.connectivity-warning-container.el-popover) {
+  background-color: var(--el-color-warning-light-9);
+  border: 1px solid var(--el-color-warning);
+}
+</style>
diff --git a/src/components/index.js b/src/components/index.js
index d3bc027..25cbd0a 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,7 +1,9 @@
 import AnnotationPopup from "./Tooltip/AnnotationPopup.vue";
 import CreateTooltipContent from "./Tooltip/CreateTooltipContent.vue";
 import ConnectivityGraph from "./ConnectivityGraph/ConnectivityGraph.vue";
+import ConnectivityGraphNew from "./ConnectivityGraph/ConnectivityGraphNew.vue";
 import ConnectivityList from "./ConnectivityList/ConnectivityList.vue";
+import ConnectivityListNew from "./ConnectivityList/ConnectivityListNew.vue";
 import CopyToClipboard from "./CopyToClipboard/CopyToClipboard.vue";
 import DrawToolbar from "./DrawToolbar/DrawToolbar.vue";
 import HelpModeDialog from "./HelpModeDialog/HelpModeDialog.vue";
@@ -16,6 +18,7 @@ import {
   queryPathsByDestination,
   queryPathsByRoute,
   queryForwardBackwardConnections,
+  querySingleConnectivityList,
 } from "./CompetencyQueries/CompetencyQueries.js";
 import {
   filterOrigins,
@@ -37,6 +40,8 @@ export {
   CreateTooltipContent,
   ConnectivityGraph,
   ConnectivityList,
+  ConnectivityListNew,
+  ConnectivityGraphNew,
   CopyToClipboard,
   DrawToolbar,
   HelpModeDialog,
@@ -50,6 +55,7 @@ export {
   queryPathsByDestination,
   queryPathsByRoute,
   queryForwardBackwardConnections,
+  querySingleConnectivityList,
   filterOrigins,
   filterDestinations,
   filterViaLocations,
diff --git a/src/components/utilities.js b/src/components/utilities.js
index f446f71..0181309 100644
--- a/src/components/utilities.js
+++ b/src/components/utilities.js
@@ -54,9 +54,17 @@ const delay = (ms) => {
   return new Promise(resolve => setTimeout(resolve, ms));
 };
 
+const removeDuplicates = function (arrayOfAnything) {
+  if (!arrayOfAnything) return []
+  return [...new Set(arrayOfAnything.map((e) => JSON.stringify(e)))].map((e) =>
+    JSON.parse(e)
+  )
+}
+
 export {
   capitalise,
   titleCase,
   xmlToJSON,
   delay,
+  removeDuplicates,
 };