diff --git a/ontology-manager-client/public/favicon.ico b/ontology-manager-client/public/favicon.ico
index d11bdd6..8ded74e 100644
Binary files a/ontology-manager-client/public/favicon.ico and b/ontology-manager-client/public/favicon.ico differ
diff --git a/ontology-manager-client/public/index.html b/ontology-manager-client/public/index.html
index 5e6f217..c8a459e 100644
--- a/ontology-manager-client/public/index.html
+++ b/ontology-manager-client/public/index.html
@@ -7,7 +7,8 @@
         <meta name="theme-color" content="#000000" />
         <meta
             name="description"
-            content="Web site created using create-react-app"
+            content="Empowering the research on plant-derived natural products for the treatment of diseases
+            using an advanced data collection, exchange and analysis platform, with focus on the flora and epidemiological needs of Latin-America"
         />
         <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
         <!--
diff --git a/ontology-manager-client/public/logo192.png b/ontology-manager-client/public/logo192.png
index fc44b0a..b36fc50 100644
Binary files a/ontology-manager-client/public/logo192.png and b/ontology-manager-client/public/logo192.png differ
diff --git a/ontology-manager-client/public/logo512.png b/ontology-manager-client/public/logo512.png
index a4e47a6..a1ba1d2 100644
Binary files a/ontology-manager-client/public/logo512.png and b/ontology-manager-client/public/logo512.png differ
diff --git a/ontology-manager-client/public/manifest.json b/ontology-manager-client/public/manifest.json
index f01493f..512fe51 100644
--- a/ontology-manager-client/public/manifest.json
+++ b/ontology-manager-client/public/manifest.json
@@ -1,6 +1,6 @@
 {
-    "short_name": "React App",
-    "name": "Create React App Sample",
+    "short_name": "One Health",
+    "name": "Natural One Health",
     "icons": [
         {
             "src": "favicon.ico",
diff --git a/ontology-manager-client/src/Style.scss b/ontology-manager-client/src/Style.scss
index e38ced1..225e660 100644
--- a/ontology-manager-client/src/Style.scss
+++ b/ontology-manager-client/src/Style.scss
@@ -49,9 +49,18 @@
     max-width: 0px;
 }
 
-.page-container {
+.page-container-wide {
+    padding-top: 30px;
     padding-left: 5%;
     padding-right: 5%;
+    padding-bottom: 30px;
+}
+
+.page-container-narrow {
+    padding-top: 30px;
+    padding-left: 15%;
+    padding-right: 15%;
+    padding-bottom: 30px;
 }
 
 .one-health-panel {
diff --git a/ontology-manager-client/src/assets/oh_logo.svg b/ontology-manager-client/src/assets/oh_logo.svg
new file mode 100644
index 0000000..1211090
--- /dev/null
+++ b/ontology-manager-client/src/assets/oh_logo.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="2525px" height="2619px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g><path style="opacity:0.946" fill="#80a63e" d="M 1461.5,214.5 C 1675.81,221.39 1861.14,297.223 2017.5,442C 2057.15,478.954 2092.31,519.454 2123,563.5C 2276.25,786.305 2318.58,1028.97 2250,1291.5C 2237.46,1340.44 2219.8,1387.44 2197,1432.5C 2099.82,1631.35 1947.65,1769.85 1740.5,1848C 1656.07,1879.69 1568.74,1897.02 1478.5,1900C 1320.69,1905.71 1172.03,1871.71 1032.5,1798C 1020.17,1791.17 1007.83,1784.33 995.5,1777.5C 977.972,1796.2 960.972,1815.36 944.5,1835C 940.139,1836.89 936.139,1836.22 932.5,1833C 883.363,1795.34 834.863,1756.84 787,1717.5C 784.828,1711.86 785.495,1706.52 789,1701.5C 803.167,1685.33 817.333,1669.17 831.5,1653C 686.173,1509.14 604.673,1334.64 587,1129.5C 573.44,950.079 613.44,783.746 707,630.5C 882.191,356.103 1133.69,217.437 1461.5,214.5 Z M 1482.5,331.5 C 1728.08,358.696 1917.42,475.363 2050.5,681.5C 2046.19,698.333 2036.19,703.167 2020.5,696C 1889.6,498.752 1705.26,390.419 1467.5,371C 1454.56,363.911 1451.89,354.245 1459.5,342C 1466.4,336.651 1474.07,333.151 1482.5,331.5 Z M 1343.5,501.5 C 1387.04,508.543 1412.54,533.876 1420,577.5C 1425.93,614.449 1414.43,644.615 1385.5,668C 1379.01,672.748 1372.34,677.248 1365.5,681.5C 1364.53,708.508 1363.37,735.508 1362,762.5C 1361.29,777.597 1359.79,792.597 1357.5,807.5C 1317.5,833.167 1277.5,858.833 1237.5,884.5C 1235.89,903.118 1234.89,921.785 1234.5,940.5C 1235.04,958.851 1235.87,977.185 1237,995.5C 1278.68,1021.3 1321.52,1045.3 1365.5,1067.5C 1435.5,1023.83 1506.17,981.161 1577.5,939.5C 1646.47,977.173 1714.13,1016.84 1780.5,1058.5C 1780.83,1059.33 1781.17,1060.17 1781.5,1061C 1783.91,1103.62 1784.91,1146.29 1784.5,1189C 1784.33,1213.17 1784.17,1237.33 1784,1261.5C 1783.83,1268.52 1783.33,1275.52 1782.5,1282.5C 1722,1319.85 1662.16,1358.18 1603,1397.5C 1601.14,1416.25 1600.31,1435.08 1600.5,1454C 1600.62,1472.18 1601.12,1490.34 1602,1508.5C 1603.75,1514.97 1607.08,1515.97 1612,1511.5C 1640.57,1443.6 1687.73,1393.1 1753.5,1360C 1829.54,1335.07 1904.87,1337.07 1979.5,1366C 1982.06,1368.29 1983.73,1371.13 1984.5,1374.5C 1964.03,1436.44 1930.03,1489.61 1882.5,1534C 1827.11,1580.14 1764.78,1592.48 1695.5,1571C 1686.16,1568.16 1677.16,1564.5 1668.5,1560C 1664.67,1557.5 1661.5,1554.33 1659,1550.5C 1658.34,1546.97 1659.51,1544.14 1662.5,1542C 1666.89,1539.14 1671.55,1536.81 1676.5,1535C 1707.49,1527.33 1738.49,1519.67 1769.5,1512C 1828.53,1494.95 1876.7,1462.11 1914,1413.5C 1917,1410.06 1917.16,1406.56 1914.5,1403C 1880.16,1399.27 1846.5,1402.6 1813.5,1413C 1713.3,1442.87 1641.3,1505.2 1597.5,1600C 1609.18,1634.56 1597.51,1647.39 1562.5,1638.5C 1561.98,1620.3 1559.81,1602.3 1556,1584.5C 1488.97,1463.37 1385.81,1403.04 1246.5,1403.5C 1244.02,1407.05 1243.86,1410.72 1246,1414.5C 1274.98,1455.08 1312.81,1484.25 1359.5,1502C 1405.25,1515.6 1451.25,1528.27 1497.5,1540C 1504,1545.47 1503.66,1550.8 1496.5,1556C 1432.83,1590 1369.17,1590 1305.5,1556C 1244.03,1509.83 1201.03,1450.16 1176.5,1377C 1180.12,1371.04 1184.79,1366.04 1190.5,1362C 1354.91,1309.24 1473.91,1360.4 1547.5,1515.5C 1550.61,1516.98 1553.44,1516.65 1556,1514.5C 1560.68,1476.6 1561.68,1438.6 1559,1400.5C 1496.41,1361.79 1434.24,1322.46 1372.5,1282.5C 1370.92,1233.51 1369.76,1184.51 1369,1135.5C 1368.67,1131.17 1368.33,1126.83 1368,1122.5C 1324.2,1093.35 1279.04,1066.35 1232.5,1041.5C 1176.99,1075.76 1120.65,1108.76 1063.5,1140.5C 1009.22,1110.86 956.215,1079.19 904.5,1045.5C 903.702,1043.92 903.202,1042.26 903,1040.5C 902.11,1011.84 901.61,983.174 901.5,954.5C 901.312,924.108 902.146,893.775 904,863.5C 956.091,828.105 1009.76,795.105 1065,764.5C 1116,792.5 1167,820.5 1218,848.5C 1251.38,830.438 1283.71,810.771 1315,789.5C 1320.71,753.62 1321.71,717.62 1318,681.5C 1302.85,672.358 1289.52,661.025 1278,647.5C 1251.22,592.809 1262.05,547.309 1310.5,511C 1321.22,506.409 1332.22,503.242 1343.5,501.5 Z M 1737.5,513.5 C 1742.25,513.136 1746.08,514.802 1749,518.5C 1753.75,524.327 1757.75,530.66 1761,537.5C 1780.02,582.244 1790.19,628.911 1791.5,677.5C 1787.64,783.273 1741.8,864.94 1654,922.5C 1646.48,918.654 1639.82,913.654 1634,907.5C 1616.54,887.24 1600.54,865.907 1586,843.5C 1549.44,777.625 1549.44,711.625 1586,645.5C 1622.27,591.223 1668.77,548.056 1725.5,516C 1729.64,515.161 1733.64,514.327 1737.5,513.5 Z M 1087.5,545.5 C 1106.52,546.657 1121.69,554.99 1133,570.5C 1149.93,598.203 1150.93,626.536 1136,655.5C 1123.41,672.882 1106.25,682.048 1084.5,683C 1079.5,683.667 1074.5,683.667 1069.5,683C 1035.41,666.523 1020.57,639.357 1025,601.5C 1033.82,569.167 1054.65,550.501 1087.5,545.5 Z M 946.5,676.5 C 962.968,685.078 966.134,697.078 956,712.5C 951.002,717.607 945.168,718.773 938.5,716C 929.615,713.961 925.615,708.461 926.5,699.5C 925.795,692.113 928.461,686.28 934.5,682C 938.475,679.854 942.475,678.02 946.5,676.5 Z M 1976.5,738.5 C 1981.57,738.34 1986.57,738.84 1991.5,740C 1993.63,743.13 1996.13,745.963 1999,748.5C 1999.67,805.832 1981.34,856.166 1944,899.5C 1912.98,931.418 1875.15,949.585 1830.5,954C 1813.53,955.337 1796.53,955.837 1779.5,955.5C 1768.29,881.118 1792.96,821.951 1853.5,778C 1890.63,752.679 1931.63,739.512 1976.5,738.5 Z M 790.5,757.5 C 794.846,757.334 799.179,757.501 803.5,758C 809.339,762.999 813.339,769.166 815.5,776.5C 783.295,852.989 764.461,932.656 759,1015.5C 749.965,1226.52 820.798,1405.02 971.5,1551C 1140.91,1697.22 1337.24,1755.56 1560.5,1726C 1572.48,1736.61 1572.48,1747.28 1560.5,1758C 1539.56,1763.71 1518.23,1767.04 1496.5,1768C 1234.46,1782.07 1021.63,1687.57 858,1484.5C 701.959,1260.8 674.626,1022.14 776,768.5C 779.951,763.466 784.784,759.799 790.5,757.5 Z M 1935.5,1042.5 C 1939.16,1041.87 1941.66,1043.21 1943,1046.5C 1946.76,1056.88 1949.26,1067.55 1950.5,1078.5C 1961.24,1079.07 1971.9,1080.24 1982.5,1082C 1992.85,1088.41 1992.85,1095.08 1982.5,1102C 1972.83,1103.28 1963.17,1104.44 1953.5,1105.5C 1951.3,1116.59 1947.8,1127.25 1943,1137.5C 1935.07,1142.7 1929.07,1141.04 1925,1132.5C 1924.2,1122.38 1922.7,1112.38 1920.5,1102.5C 1910.83,1102.67 1901.16,1102.5 1891.5,1102C 1882.02,1096.64 1881.02,1089.97 1888.5,1082C 1899.08,1080.11 1909.75,1078.94 1920.5,1078.5C 1922.37,1068.36 1924.87,1058.36 1928,1048.5C 1930.13,1045.85 1932.63,1043.85 1935.5,1042.5 Z M 878.5,1167.5 C 891.043,1165.19 899.21,1170.19 903,1182.5C 902.489,1198.34 894.322,1205.84 878.5,1205C 865.807,1200.24 861.64,1191.41 866,1178.5C 868.505,1172.82 872.671,1169.16 878.5,1167.5 Z M 1098.5,1226.5 C 1111,1226.49 1117.5,1232.83 1118,1245.5C 1120.25,1290.53 1119.91,1335.53 1117,1380.5C 1108.3,1396.93 1098.63,1397.6 1088,1382.5C 1086.08,1364.56 1085.24,1346.56 1085.5,1328.5C 1066.52,1326.35 1047.52,1326.02 1028.5,1327.5C 1026.26,1346.77 1024.76,1366.1 1024,1385.5C 1012.71,1398.08 1002.71,1397.08 994,1382.5C 992,1334.5 992,1286.5 994,1238.5C 1002.78,1225.07 1012.78,1224.07 1024,1235.5C 1024.37,1255 1026.2,1274.33 1029.5,1293.5C 1046.78,1296 1064.11,1296.16 1081.5,1294C 1082,1293.5 1082.5,1293 1083,1292.5C 1085.27,1274.22 1086.93,1255.89 1088,1237.5C 1090.38,1232.62 1093.88,1228.95 1098.5,1226.5 Z M 2026.5,1236.5 C 2034.11,1235.93 2039.28,1239.26 2042,1246.5C 2044.72,1255.47 2044.88,1264.3 2042.5,1273C 2032.86,1274.66 2023.19,1274.82 2013.5,1273.5C 1999.09,1254.09 2003.42,1241.75 2026.5,1236.5 Z M 1151.5,1510.5 C 1156.45,1509.63 1160.61,1510.96 1164,1514.5C 1175.87,1531.6 1172.03,1543.6 1152.5,1550.5C 1133.74,1545.06 1128.91,1533.73 1138,1516.5C 1142.06,1513.22 1146.56,1511.22 1151.5,1510.5 Z M 1694.5,1683.5 C 1702.87,1683.35 1708.37,1687.35 1711,1695.5C 1713.27,1704.49 1710.77,1711.99 1703.5,1718C 1688.16,1724.92 1672.66,1731.42 1657,1737.5C 1642.08,1732.83 1637.25,1723.33 1642.5,1709C 1657.9,1696.47 1675.23,1687.97 1694.5,1683.5 Z"/></g>
+<g><path style="opacity:0.831" fill="#80a63e" d="M 1336.5,539.5 C 1363.19,537.697 1378.36,550.03 1382,576.5C 1382.86,590.204 1382.53,603.871 1381,617.5C 1379.05,624.058 1376.05,630.058 1372,635.5C 1349.82,649.668 1328.82,648.001 1309,630.5C 1298.63,607.373 1297.96,584.04 1307,560.5C 1310.42,555.077 1314.59,550.244 1319.5,546C 1324.89,542.752 1330.55,540.585 1336.5,539.5 Z"/></g>
+<g><path style="opacity:0.823" fill="#80a63f" d="M 1081.5,564.5 C 1102.15,563.291 1115.65,572.625 1122,592.5C 1130.73,619.064 1125.23,642.231 1105.5,662C 1057.98,668.477 1038.15,647.977 1046,600.5C 1049.64,580.069 1061.48,568.069 1081.5,564.5 Z"/></g>
+<g><path style="opacity:0.852" fill="#80a73e" d="M 1722.5,581.5 C 1726,585.865 1727.17,590.865 1726,596.5C 1718.52,654.073 1709.52,711.407 1699,768.5C 1690.39,805.338 1678.39,841.005 1663,875.5C 1656.73,881.097 1651.07,880.43 1646,873.5C 1603.94,796.946 1606.94,722.279 1655,649.5C 1674.36,623.638 1696.86,600.971 1722.5,581.5 Z"/></g>
+<g><path style="opacity:0.808" fill="#80a63f" d="M 1941.5,785.5 C 1943.86,785.337 1946.19,785.503 1948.5,786C 1952.31,792.019 1952.47,798.185 1949,804.5C 1924.61,866.397 1880.77,907.397 1817.5,927.5C 1809.72,926.711 1806.39,922.378 1807.5,914.5C 1817.44,867.779 1842.78,831.946 1883.5,807C 1901.95,797.131 1921.28,789.965 1941.5,785.5 Z"/></g>
+<g><path style="opacity:0.878" fill="#80a63e" d="M 1068.5,812.5 C 1072,813.104 1075.33,814.27 1078.5,816C 1115.9,838.239 1152.9,861.072 1189.5,884.5C 1193.32,929.802 1193.48,975.135 1190,1020.5C 1149.07,1045.38 1107.57,1069.38 1065.5,1092.5C 1022.46,1071.89 981.622,1047.89 943,1020.5C 942.933,974.138 944.099,927.805 946.5,881.5C 982.632,859.865 1018.63,838.032 1054.5,816C 1059.14,814.223 1063.8,813.056 1068.5,812.5 Z"/></g>
+<g><path style="opacity:0.935" fill="#80a63e" d="M 1573.5,988.5 C 1578.18,988.334 1582.85,988.501 1587.5,989C 1638.57,1020.24 1689.23,1052.07 1739.5,1084.5C 1743.32,1144.48 1743.49,1204.48 1740,1264.5C 1691.71,1292.48 1644.21,1321.64 1597.5,1352C 1584.82,1359.27 1572.16,1359.27 1559.5,1352C 1512.68,1321.05 1464.68,1291.88 1415.5,1264.5C 1414.67,1257.52 1414.17,1250.52 1414,1243.5C 1413.33,1197.5 1413.33,1151.5 1414,1105.5C 1414.17,1098.48 1414.67,1091.48 1415.5,1084.5C 1464.84,1054.5 1513.84,1024 1562.5,993C 1566.27,991.441 1569.93,989.941 1573.5,988.5 Z"/></g>
+<g><path style="opacity:0.963" fill="#80a63e" d="M 720.5,1737.5 C 728.253,1737.1 735.92,1737.6 743.5,1739C 806.449,1786.94 867.949,1836.77 928,1888.5C 930.277,1901.94 929.944,1915.28 927,1928.5C 776.288,2112.88 625.955,2297.54 476,2482.5C 425.766,2541.62 364.266,2557.12 291.5,2529C 286.167,2526.67 280.833,2524.33 275.5,2522C 211.449,2472 193.282,2408.5 221,2331.5C 247.384,2297.45 273.384,2263.12 299,2228.5C 431.643,2072.87 561.643,1915.21 689,1755.5C 697.754,1746.2 708.254,1740.2 720.5,1737.5 Z"/></g>
+</svg>
diff --git a/ontology-manager-client/src/features/modules/visualization/neighborhood-explorer/neighborhood-explorer.component.tsx b/ontology-manager-client/src/features/modules/visualization/neighborhood-explorer/neighborhood-explorer.component.tsx
index 8936321..5a579d1 100644
--- a/ontology-manager-client/src/features/modules/visualization/neighborhood-explorer/neighborhood-explorer.component.tsx
+++ b/ontology-manager-client/src/features/modules/visualization/neighborhood-explorer/neighborhood-explorer.component.tsx
@@ -15,7 +15,7 @@ import { DataView } from 'primereact/dataview';
 import { IQueryGraph } from '../../../query-history/query-history-graph/graph-query';
 import { MessageServiceContext } from '../../../shared/messages';
 import { dependencyFactory } from '../../../shared/injection';
-import { IEntityTypeService, IGeneralSearchService, IGraphVisualizationHistoryService, SERVICES } from '../../../../services';
+import { IEntityService, IEntityTypeService, IGeneralSearchService, IGraphVisualizationHistoryService, SERVICES } from '../../../../services';
 import { ISavedGraphVisualization } from '../visualization-history/models/saved-graph-visualization';
 import { ConfirmDialog, confirmDialog } from 'primereact/confirmdialog';
 import { Divider } from 'primereact/divider';
@@ -30,6 +30,7 @@ import { IconField } from "primereact/iconfield";
 import { InputIcon } from "primereact/inputicon";
 import { IEntityType } from '../../metadata/entity-types';
 import { Checkbox } from 'primereact/checkbox';
+import * as XLSX from 'xlsx';
 
 
 const React = require('react');
@@ -62,6 +63,7 @@ const NeighborhoodExplorerComponent: React.FC<GraphExplorerProps> = ({graphServi
 
 
     const myComponentRef : RefObject<CytoscapeInteractiveChartComponent> = useRef<CytoscapeInteractiveChartComponent>(null);
+    const entityService = dependencyFactory.get<IEntityService>(SERVICES.IEntityService);
 
     
     const [elements, setElements] = useState<any>([]);
@@ -134,6 +136,20 @@ const NeighborhoodExplorerComponent: React.FC<GraphExplorerProps> = ({graphServi
     )
 
     const downloadOptions = [
+        {
+            label: 'XLXS',
+            command: async () => {
+
+                const results = await entityService.getGraphReferences(myComponentRef.current!.getNodes(), messageService!);
+
+
+                const ws = XLSX.utils.json_to_sheet(results);
+                const wb = XLSX.utils.book_new();
+                XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+                XLSX.writeFile(wb, 'co-ocurrences.xlsx');
+
+            }
+        },
         {
             label: 'Cytoscape JSON',
             command: () => {
@@ -463,6 +479,8 @@ const NeighborhoodExplorerComponent: React.FC<GraphExplorerProps> = ({graphServi
                                         onClick={ async (e) => {
                                             const elements = myComponentRef.current!.getElements();
 
+
+
                                             savedVisualization = {
                                                 id: "",
                                                 name: "Untitled",
@@ -484,6 +502,17 @@ const NeighborhoodExplorerComponent: React.FC<GraphExplorerProps> = ({graphServi
                                 model={downloadOptions} 
                                 tooltip="Download graph"
                                 tooltipOptions={{position: 'bottom', showDelay: 1000}}
+                                onClick={async () => {
+
+                                    const results = await entityService.getGraphReferences(myComponentRef.current!.getNodes(), messageService!);
+                    
+                    
+                                    const ws = XLSX.utils.json_to_sheet(results);
+                                    const wb = XLSX.utils.book_new();
+                                    XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+                                    XLSX.writeFile(wb, 'co-ocurrences.xlsx');
+                    
+                                }}
                             
                             />
                         </div>
diff --git a/ontology-manager-client/src/features/pages/contact.component.tsx b/ontology-manager-client/src/features/pages/contact.component.tsx
deleted file mode 100644
index 0827114..0000000
--- a/ontology-manager-client/src/features/pages/contact.component.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Image } from 'primereact/image';
-import homeBackground from '../../resources/Picture1.svg';
-import heroSectionImage from '../../resources/img/hero-section-bg.png';
-import { InputText } from 'primereact/inputtext';
-
-const React = require('react');
-
-const ContactPage: React.FC = () => {
-    return (
-        <div>
-           Contact Page
-        </div>
-    );
-};
-
-export default ContactPage;
diff --git a/ontology-manager-client/src/features/pages/documentation-component.tsx b/ontology-manager-client/src/features/pages/documentation-component.tsx
deleted file mode 100644
index 9a11e69..0000000
--- a/ontology-manager-client/src/features/pages/documentation-component.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-const React = require('react');
-
-const Documentation: React.FC = () => {
-    return <>This is the documentation page</>;
-};
-
-export default Documentation;
diff --git a/ontology-manager-client/src/features/pages/home-component.tsx b/ontology-manager-client/src/features/pages/home-component.tsx
deleted file mode 100644
index fa1dd78..0000000
--- a/ontology-manager-client/src/features/pages/home-component.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Image } from 'primereact/image';
-import homeBackground from '../../resources/Picture1.svg';
-import heroSectionImage from '../../resources/img/hero-section-bg.png';
-import { InputText } from 'primereact/inputtext';
-
-const React = require('react');
-
-const Home: React.FC = () => {
-    return (
-        <div>
-            <div className='row'>
-                <div className='col-6'>
-                    <div style={{width: '100%', height: '100%',paddingLeft: '10%', paddingRight: '10%', paddingTop: '30%', }} >
-
-                    <h1 style={{fontSize:"50px"}}>
-                        Empowering Drug Research with Comprehensive Biochemical Data
-                    </h1>
-                    <p>
-                        Discover our collection of biochemical data to support groundbreaking research in drug development
-                    </p>
-                    <div style={{width: '100%', paddingLeft: '10%', paddingRight: '10%', paddingTop: '30px'}}>
-
-                        <div style={{ width: '90%' }}>
-                            <span className="p-input-icon-left w-100">
-                                <i className="pi pi-search" />
-                                <InputText placeholder="Start your search here..." className="w-100" />
-                            </span>
-                        </div>
-                    </div>
-                    </div>
-                </div>
-                <div className='col-6'>
-                    <img
-                        src={heroSectionImage}
-                        alt="Your SVG"
-                        style={{ width: '100%', height: '925px', marginTop: '-50px' }}
-                    />
-                </div>
-            </div>
-            <path
-                style={{ fill: 'white', width: '100px' }}
-                opacity="0.33"
-                d="M473,67.3c-203.9,88.3-263.1-34-320.3,0C66,119.1,0,59.7,0,59.7V0h1000v59.7 c0,0-62.1,26.1-94.9,29.3c-32.8,3.3-62.8-12.3-75.8-22.1C806,49.6,745.3,8.7,694.9,4.7S492.4,59,473,67.3z"
-            ></path>
-        </div>
-    );
-};
-
-export default Home;
diff --git a/ontology-manager-client/src/features/pages/index.ts b/ontology-manager-client/src/features/pages/index.ts
deleted file mode 100644
index b80a85e..0000000
--- a/ontology-manager-client/src/features/pages/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as NotFound } from './not-found-component';
-export { default as Documentation } from './documentation-component';
-export { default as Home } from './home-component';
diff --git a/ontology-manager-client/src/features/pages/not-found-component.tsx b/ontology-manager-client/src/features/pages/not-found-component.tsx
deleted file mode 100644
index 2e7c7ab..0000000
--- a/ontology-manager-client/src/features/pages/not-found-component.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-const React = require('react');
-
-const NotFound: React.FC = () => {
-    return <>404 Not found page</>;
-};
-
-export default NotFound;
diff --git a/ontology-manager-client/src/features/shared/cytoscape-interactive-chart/cytoscape-interactive-chart.component.tsx b/ontology-manager-client/src/features/shared/cytoscape-interactive-chart/cytoscape-interactive-chart.component.tsx
index 4276483..398d886 100644
--- a/ontology-manager-client/src/features/shared/cytoscape-interactive-chart/cytoscape-interactive-chart.component.tsx
+++ b/ontology-manager-client/src/features/shared/cytoscape-interactive-chart/cytoscape-interactive-chart.component.tsx
@@ -162,6 +162,13 @@ class CytoscapeInteractiveChartComponent extends Component<CytoscapeInteractiveC
         })
     }
 
+    getNodes() {
+        const nodes = this.cytoscapeCore.elements().jsons()
+                                        .filter((x:any) => x.group==="nodes" && x.data.id !== HIGHLIGHT)
+                                        .map((x:any) => x.data.id);
+        return nodes;
+    }
+
     getElements() {
         const elements = this.cytoscapeCore.json().elements;
         return JSON.stringify(elements);
diff --git a/ontology-manager-client/src/layout/app.component.scss b/ontology-manager-client/src/layout/app.component.scss
index 86ca95f..1714d36 100644
--- a/ontology-manager-client/src/layout/app.component.scss
+++ b/ontology-manager-client/src/layout/app.component.scss
@@ -2,7 +2,7 @@
 
 .content {
     background-color: white;
-    padding-top: $app-header-height + 30px;
+    padding-top: $app-header-height;
     padding-bottom: 80px;
     max-width: 1920px;
     flex: 1;
diff --git a/ontology-manager-client/src/layout/footer.component.scss b/ontology-manager-client/src/layout/footer.component.scss
index 6d6ebcb..9d382c2 100644
--- a/ontology-manager-client/src/layout/footer.component.scss
+++ b/ontology-manager-client/src/layout/footer.component.scss
@@ -7,4 +7,7 @@
     position: fixed;
     bottom: 0;
     z-index: 1000;
+    width: 100%;
+    padding: 10px;
+    margin: 0;
 }
\ No newline at end of file
diff --git a/ontology-manager-client/src/layout/footer.component.tsx b/ontology-manager-client/src/layout/footer.component.tsx
index 2571936..0e4ef9b 100644
--- a/ontology-manager-client/src/layout/footer.component.tsx
+++ b/ontology-manager-client/src/layout/footer.component.tsx
@@ -9,22 +9,22 @@ import './footer.component.scss';
 
 const Footer: React.FC = () => {
     return (
-        <div className='row app-footer col-12' style={{paddingTop: '10px', paddingBottom: '10px', paddingLeft: '10px', paddingRight: '10px'}}>
-            <div className='col-8'>
+        <div className='row app-footer'>
+            <div className='col-7'>
                 <div className='row'>
                     <div className='col-2'>
-                        <img alt="logo" src={logoIpb} height="60" style={{marginRight: '3px', marginLeft: '50px'}}></img>
+                        <img alt="logo" src={logoIpb} height="60" style={{marginRight: '3px'}}></img>
                     </div>
-                    <div className='col-8'>
+                    <div className='col-10' style={{display: "flex", alignItems: 'center'}}>
                         <p style={{fontSize: '8px', paddingTop: '20px'}}>
                             The Natural-One-Health service (n1h.org) is developed and operated by the Leibniz Institute of Plant Biochemistry. See
-                            the <a href="https://www.ipb-halle.de/kontakt/impressum">imprint</a> for legal details.
+                            the <a href="https://www.ipb-halle.de/kontakt/impressum" target='_blank'>imprint</a> for legal details.
                         </p>
                     </div>
                 </div>
             </div>
-            <div className='col-4'>
-                <img alt="logo" src={logoGlacier} height="60" style={{marginRight: '3px', marginLeft: '50px'}}></img>
+            <div className='col-5' style={{display: 'flex', alignItems: 'center'}}>
+                <img alt="logo" src={logoGlacier} height="60" style={{marginRight: '3px', marginLeft: 'auto'}}></img>
                 <img alt="logo" src={logoDaad} height="60" style={{marginRight: '3px'}}></img>
                 <img alt="logo" src={logoDip} height="40" style={{marginRight: '3px'}}></img>
                 <img alt="logo" src={logoLeibniz} height="60" style={{marginRight: '3px'}}></img>
diff --git a/ontology-manager-client/src/layout/header.component.tsx b/ontology-manager-client/src/layout/header.component.tsx
index 86457f6..0b5cd67 100644
--- a/ontology-manager-client/src/layout/header.component.tsx
+++ b/ontology-manager-client/src/layout/header.component.tsx
@@ -3,6 +3,7 @@ import { Menubar } from 'primereact/menubar';
 import { MenuItem } from 'primereact/menuitem';
 import { useNavigate } from 'react-router-dom';
 import oneHealthLogo from '../assets/logo_one_health.png';
+import logo from '../assets/oh_logo.svg';
 import './header.component.scss';
 
 const Header: React.FC = () => {
@@ -118,7 +119,7 @@ const Header: React.FC = () => {
     ];
 
     const start = (
-        <img alt="logo" src={oneHealthLogo} height="40" style={{marginLeft: 10}} className="mr-2"></img>
+        <img alt="logo" src={logo} height="40" style={{marginLeft: 10}} className="mr-2"></img>
     );
 
     return (
diff --git a/ontology-manager-client/src/pages/documentation/documentation-page.component.tsx b/ontology-manager-client/src/pages/documentation/documentation-page.component.tsx
index 70f5bde..394ea60 100644
--- a/ontology-manager-client/src/pages/documentation/documentation-page.component.tsx
+++ b/ontology-manager-client/src/pages/documentation/documentation-page.component.tsx
@@ -1,11 +1,12 @@
 
 import { Accordion, AccordionTab } from 'primereact/accordion';
 import { PageTitle } from '../../components';
+import { toolDisclaimer } from '../../utils';
         
 const React = require('react');
 
 const DocumentationPageComponent: React.FC = () => {
-    return <div className='container'>
+    return <div className='page-container-narrow'>
     
     <PageTitle icon='pi pi-book' title='Documentation' help={false}></PageTitle>
     
@@ -13,17 +14,20 @@ const DocumentationPageComponent: React.FC = () => {
              
     <AccordionTab header="Mission">
         <p className="m-0">
-        Create a digital data exchange platform and a virtual repository for the surveillance of emerging infectious diseases and anti-infectives
+        The creation of an advanced data collection and analysis software tool dedicated to empower the joined research and knowledge exchange of the <b>GLACIER</b> consortium (and beyond) on plant-derived natural products and their usage for the treatment of infectious diseases, with focus on the flora and epidemiological needs of Latin-America. <br/><br/>
+        <b>GLACIER</b> (German Latin-American Center for Infection and Epidemiology Research &amp; Training) is an international multidisciplinary consortium that aims to level regional disparities in Latin America by strengthening surveillance and response to emerging infectious diseases and developing new vaccines and therapies. GLACIER is made up of more than 30 cooperating institutions from nine countries (Germany, Mexico, Cuba, Costa Rica, Nicaragua, Honduras, El Salvador, Panama, and Guatemala).
+For further information, please visit the GLACIER consortium’s official website <a href='https://glacieronehealth.org/about/'>About | GLACIER One Health Project</a>
         </p>
     </AccordionTab>
     <AccordionTab header="Location">
         <p className="m-0">
-            <b>One Health</b> is a project of the <a href='https://www.ipb-halle.de/'>Leibniz Institute for Plant Biochemistry</a> at Weinberg 3,  06120 Halle (Saale), Germany
+            This data collection and analysis software tool is a project developed and curated by the Leibniz Institute of Plant Biochemistry (IPB, Weinberg 3, D-06120 Halle (Saale), Germany) in scope of the GLACIER consortium.
         </p>
     </AccordionTab>
     <AccordionTab header="Funding">
         <p className="m-0">
-            <b>One Health</b> is developed and curated by <b>GLACIER</b> (German Latin-American Center for Infection and Epidemiology Research &amp; Training) is an international multidisciplinary consortium that aims to level regional disparities in Latin America by strengthening surveillance and response to emerging infectious diseases and developing new vaccines and therapies. GLACIER is made up of more than 30 cooperating institutions from nine countries (Germany, Mexico, Cuba, Costa Rica, Nicaragua, Honduras, El Salvador, Panama, and Guatemala).
+            The development of this tool, as part of the activities of the <b>GLACIER</b> consortium, is funded by the <b>DAAD</b>, Germany (Deutscher Akademischer Austauschdienst/German Academic Exchange Service; funding code DAAD 57592717).<br/><br/>
+            <b>GLACIER</b> (German Latin-American Center for Infection and Epidemiology Research &amp; Training) is an international multidisciplinary consortium that aims to level regional disparities in Latin America by strengthening surveillance and response to emerging infectious diseases and developing new vaccines and therapies. GLACIER is made up of more than 30 cooperating institutions from nine countries (Germany, Mexico, Cuba, Costa Rica, Nicaragua, Honduras, El Salvador, Panama, and Guatemala).
 For further information, please visit the GLACIER consortium’s official website <a href='https://glacieronehealth.org/about/'>About | GLACIER One Health Project</a>
         </p>
     </AccordionTab>
@@ -81,6 +85,12 @@ For further information, please visit the GLACIER consortium’s official websit
 
 
 
+    </AccordionTab>
+    <AccordionTab header="Disclaimer">
+    At the moment, this tool is still primarily focused on the analysis of data of Cuban plants. Hence, the output for plants from other geographical regions might be weaker.
+This tool shows connections of available data which could be <b>erroneous</b>, <b>biased</b>  and <b>not necessarily the most relevant</b> one for your scientific question since  it  was <b>extracted from available data sources with an automatic process</b>. 
+We are actively working to expand the data basis (please contribute!) and improve the data quality of the platform.
+
     </AccordionTab>
     </Accordion>
     
diff --git a/ontology-manager-client/src/pages/home/home-page.component.tsx b/ontology-manager-client/src/pages/home/home-page.component.tsx
index 8133e19..96244ae 100644
--- a/ontology-manager-client/src/pages/home/home-page.component.tsx
+++ b/ontology-manager-client/src/pages/home/home-page.component.tsx
@@ -1,5 +1,4 @@
 import heroSectionImage from '../../assets/img/hero-section-bg.png';
-import { InputText } from 'primereact/inputtext';
 import logoGlacier from '../../assets/logo_glacier.png';
 import logoIpb from '../../assets/logo_ipb.png';
 import { Button } from 'primereact/button';
@@ -8,7 +7,6 @@ import neighborhoodExplorerImage from "../../assets/img/neighborhood-explorer.pn
 import coocurrencesSummaryImage from "../../assets/img/cooccurrences-summary.png";
 import contributeImage from "../../assets/img/contribute.jpeg";
 import { useNavigate } from 'react-router-dom';
-import { Message } from 'primereact/message';
 import './home-page.component.scss';
 import { Tag } from 'primereact/tag';
 
@@ -17,103 +15,111 @@ const React = require('react');
 const HomePageComponent: React.FC = () => {
     const navigate = useNavigate();
 
+    const heroSectionRow = () => {
 
-    const neighborhoodExplorerCardHeader = (
-        <img alt="Neighborhood Explorer" src={neighborhoodExplorerImage} style={{height: "100%"}}></img>
-    );
-
-    const coOccurrencesSummaryCardHeader = (
-        <img alt="Co-Occurrences Summary" src={coocurrencesSummaryImage} style={{height: "100%"}}></img>
-    );
-
-    const contributeCardHeader = (
-        <img alt="Contribute" src={contributeImage} style={{height: "100%"}}></img>
-    );
-
-    const neighborhoodExplorerCardFooter = (
-        <>
+        const neighborhoodExplorerCardHeader = (
+            <img alt="Neighborhood Explorer" src={neighborhoodExplorerImage} style={{height: "100%"}}></img>
+        );
+    
+        const neighborhoodExplorerCardFooter = (
             <Button label='Tutorial' onClick={() => {navigate('/neighborhood-explorer');}}></Button>
-        </>
-    )
-
-    const coOccurrencesSummaryCardFooter = (
-        <>
-        <Button label='Tutorial' onClick={() => {navigate('/visualization/co-ocurrence-search/');}}></Button>
-        </>
-    )
-
-    const contributeCardFooter = (
-        <>
+        );
+
+
+        const coOccurrencesSummaryCardHeader = (
+            <img alt="Co-Occurrences Summary" src={coocurrencesSummaryImage} style={{height: "100%"}}></img>
+        );
+        
+        const coOccurrencesSummaryCardFooter = (
+            <Button label='Tutorial' onClick={() => {navigate('/visualization/co-ocurrence-search/');}}></Button>
+        );
+    
+
+        const contributeCardHeader = (
+            <img alt="Contribute" src={contributeImage} style={{height: "100%"}}></img>
+        );
+    
+        const contributeCardFooter = (
             <Button label='Tutorial' onClick={() => {navigate('/ontology/data-load/0');}}></Button>
-        </>
-    )
-
-    return (
-        <div id="home-page">
+        );
+    
+        return (
             <div className='row' id='hero-section'>
                 <div className='col-6'>
-                    <div style={{width: '100%', height: '100%',paddingLeft: '10%', paddingRight: '10%', }} >
-
-                    <h2 style={{textAlign: 'center'}}>
-Empowering drug development with integrated biochemical data
-</h2>
-A platform for biochemical data exchange and virtual repository to empower drug development
-                    
-
-                    <div className='row home-card-section' style={{marginTop: "30px"}} >
- 
-
-                        <div className='col-4'>
-                            <Card title="Explore" footer={neighborhoodExplorerCardFooter} header={neighborhoodExplorerCardHeader} className="md:w-25rem">
-                                <p>
-                                Explore the connections found in scientific data between species, natural products and diseases
-                                </p>
-                            </Card>
-                        </div>
-                        <div className='col-4'>
-                        <Card title="Discover" footer={coOccurrencesSummaryCardFooter} header={coOccurrencesSummaryCardHeader} className="md:w-25rem">
-                                <p>
-                                    Discover co-occurrences of scientific concepts found in literature and datasets
-                                </p>
-                            </Card>
-                        </div>
-                        <div className='col-4'>
-                        <Card title="Contribute" footer={contributeCardFooter} header={contributeCardHeader} className="md:w-25rem">
-                                <p>
-                                   Contribute to the platform by uploading and analyzing your publications and datasets
-                                </p>
-                                <Tag severity="danger" value="Under development"></Tag>
-                            </Card>
+                    <div style={{width: '100%', height: '100%',paddingLeft: '10%', paddingRight: '10%', paddingTop: '30px', paddingBottom: '30px' }} >
+
+                        <h2 style={{textAlign: 'center'}}>
+                            Empowering the research on plant-derived natural products for the treatment of diseases
+                        </h2>
+
+                        <p style={{textAlign: 'center'}}>
+                            using an advanced data collection, exchange and analysis platform, with focus on the flora and epidemiological needs of Latin-America
+                        </p>
+                        
+                        <div className='row home-card-section' style={{marginTop: "30px"}} >
+                            <div className='col-4'>
+                                <Card title="Explore" footer={neighborhoodExplorerCardFooter} header={neighborhoodExplorerCardHeader} className="md:w-25rem">
+                                    <p>
+                                        Explore the connections found in scientific data between species, natural products and diseases
+                                    </p>
+                                </Card>
+                            </div>
+                            <div className='col-4'>
+                                <Card title="Discover" footer={coOccurrencesSummaryCardFooter} header={coOccurrencesSummaryCardHeader} className="md:w-25rem">
+                                    <p>
+                                        Discover co-occurrences of scientific concepts found in literature and datasets
+                                    </p>
+                                </Card>
+                            </div>
+                            <div className='col-4'>
+                                <Card title="Contribute" footer={contributeCardFooter} header={contributeCardHeader} className="md:w-25rem">
+                                    <p>
+                                        Contribute to the platform by uploading and analyzing your publications and datasets
+                                    </p>
+                                    <Tag severity="danger" value="Under development"></Tag>
+                                </Card>
+                            </div>
                         </div>
 
-                    </div>
 
+                        <div style={{ marginTop: '20px'}}>
 
-                    <div style={{height: '20px', marginTop: '10px'}}>
+                            <small style={{textAlign: 'center'}}>developed and curated by</small>
+                            <img alt="logo" src={logoGlacier} height="80" style={{marginRight: '3px', marginLeft: '50px'}}></img>
+                            <img alt="logo" src={logoIpb} height="80" style={{marginRight: '3px', marginLeft: '50px'}}></img>
 
-                    </div>
-                 
-                    <small style={{textAlign: 'center'}}>developed and curated by</small>
-                    <img alt="logo" src={logoGlacier} height="80" style={{marginRight: '3px', marginLeft: '50px'}}></img>
-                    <img alt="logo" src={logoIpb} height="80" style={{marginRight: '3px', marginLeft: '50px'}}></img>
+                            
+                            <div style={{height: "20px"}}></div>
+                            <small>
+                            <b>GLACIER</b> (German Latin-American Center for Infection and Epidemiology Research &amp; Training) is an international multidisciplinary consortium that aims to level regional disparities in Latin America by strengthening surveillance and response to emerging infectious diseases and developing new vaccines and therapies. GLACIER is made up of more than 30 cooperating institutions from nine countries (Germany, Mexico, Cuba, Costa Rica, Nicaragua, Honduras, El Salvador, Panama, and Guatemala).
+                For further information, please visit the GLACIER consortium’s official website <a href='https://glacieronehealth.org/about/'>About | GLACIER One Health Project</a>
 
+                            </small>
+                        </div>
                     
-                    <div style={{height: "20px"}}></div>
-                    <small>
-                    <b>GLACIER</b> (German Latin-American Center for Infection and Epidemiology Research &amp; Training) is an international multidisciplinary consortium that aims to level regional disparities in Latin America by strengthening surveillance and response to emerging infectious diseases and developing new vaccines and therapies. GLACIER is made up of more than 30 cooperating institutions from nine countries (Germany, Mexico, Cuba, Costa Rica, Nicaragua, Honduras, El Salvador, Panama, and Guatemala).
-For further information, please visit the GLACIER consortium’s official website <a href='https://glacieronehealth.org/about/'>About | GLACIER One Health Project</a>
-
-                    </small>
                     </div>
                 </div>
-                <div className='col-6'>
+                <div className='col-6' style={{padding: 0}}>
                     <img
                         src={heroSectionImage}
                         alt="Your SVG"
-                        style={{ width: '100%', height: '925px', marginTop: '-35px' }}
+                        style={{ width: '100%', height: '100%'}}
                     />
                 </div>
             </div>
+        );
+    }
+
+
+    
+
+
+
+
+
+    return (
+        <div id="home-page">
+           {heroSectionRow()}
         </div>
     );
 };
diff --git a/ontology-manager-client/src/pages/metadata/data-load/data-load-page.component.tsx b/ontology-manager-client/src/pages/metadata/data-load/data-load-page.component.tsx
index 49651f1..732c738 100644
--- a/ontology-manager-client/src/pages/metadata/data-load/data-load-page.component.tsx
+++ b/ontology-manager-client/src/pages/metadata/data-load/data-load-page.component.tsx
@@ -232,7 +232,7 @@ const DataLoadPageComponent: React.FC = () => {
 
 
     return (
-        <div className="container" style={{pointerEvents: 'none', cursor: 'not-allowed'}} >
+        <div className="page-container-narrow" style={{pointerEvents: 'none', cursor: 'not-allowed'}} >
             <PageTitle icon='pi pi-download' title='Data Load' help={true}/>
             <Messages ref={msgs} />
 
diff --git a/ontology-manager-client/src/pages/metadata/entity-type-form/entity-type-form-page.component.tsx b/ontology-manager-client/src/pages/metadata/entity-type-form/entity-type-form-page.component.tsx
index 40ba364..9400e1a 100644
--- a/ontology-manager-client/src/pages/metadata/entity-type-form/entity-type-form-page.component.tsx
+++ b/ontology-manager-client/src/pages/metadata/entity-type-form/entity-type-form-page.component.tsx
@@ -159,7 +159,7 @@ const EntityTypeFormPageComponent: React.FC = () => {
 
     return (
         
-        <div className="container" style={{pointerEvents: 'none', cursor: 'not-allowed'}}>
+        <div className="page-container-narrow" style={{pointerEvents: 'none', cursor: 'not-allowed'}}>
             <EntityTypeFormTour run={runTutorial} callback={helpTourCallback}/>
 
             <PageTitle icon='pi pi-box' title='Entity Type Editor' help={true} helpClickedHandler={helpClickedHandler}/>
diff --git a/ontology-manager-client/src/pages/metadata/link-type-form/link-type-form-page.component.tsx b/ontology-manager-client/src/pages/metadata/link-type-form/link-type-form-page.component.tsx
index c8e5ed3..716938a 100644
--- a/ontology-manager-client/src/pages/metadata/link-type-form/link-type-form-page.component.tsx
+++ b/ontology-manager-client/src/pages/metadata/link-type-form/link-type-form-page.component.tsx
@@ -111,7 +111,7 @@ const LinkTypeFormPageComponent: React.FC = () => {
 
 
     return (
-        <div className="container" style={{pointerEvents: 'none', cursor: 'not-allowed'}}>
+        <div className="page-container-narrow" style={{pointerEvents: 'none', cursor: 'not-allowed'}}>
             <PageTitle icon='pi pi-arrows-h' title='Link Type Editor' help={true}/>
             <Messages ref={msgs} />
 
diff --git a/ontology-manager-client/src/pages/metadata/metadata-overview/ontology-overview.component.tsx b/ontology-manager-client/src/pages/metadata/metadata-overview/ontology-overview.component.tsx
index dd74982..3f1d46f 100644
--- a/ontology-manager-client/src/pages/metadata/metadata-overview/ontology-overview.component.tsx
+++ b/ontology-manager-client/src/pages/metadata/metadata-overview/ontology-overview.component.tsx
@@ -111,7 +111,7 @@ const MetadataOverviewPageComponent: React.FC = () => {
 
 
     return (
-        <div className="container">
+        <div className="page-container-narrow">
             <div className="row mb-3">
                 <div className="col pt-1" style={{ maxWidth: '50px' }}>
                     <i
diff --git a/ontology-manager-client/src/pages/search/compound-search/compound-search-page.component.tsx b/ontology-manager-client/src/pages/search/compound-search/compound-search-page.component.tsx
index bc549bb..db617e3 100644
--- a/ontology-manager-client/src/pages/search/compound-search/compound-search-page.component.tsx
+++ b/ontology-manager-client/src/pages/search/compound-search/compound-search-page.component.tsx
@@ -244,7 +244,7 @@ export const CompoundSearchPageComponent: React.FC = () => {
         </>
     }
 
-    return <div className="container">
+    return <div className="page-container-narrow">
         <PageTitle icon='fa fa-atom' title='Compound Search' help={true} helpClickedHandler={helpClickedHandler}/>
 
         <CompoundSearchPageTourComponent run={runTutorial} callback={helpTourCallback}></CompoundSearchPageTourComponent>
diff --git a/ontology-manager-client/src/pages/search/general-search/general-search-page.component.tsx b/ontology-manager-client/src/pages/search/general-search/general-search-page.component.tsx
index b7f2af0..bf47f8d 100644
--- a/ontology-manager-client/src/pages/search/general-search/general-search-page.component.tsx
+++ b/ontology-manager-client/src/pages/search/general-search/general-search-page.component.tsx
@@ -120,7 +120,7 @@ export const GeneralSearchPageComponent: React.FC = () => {
         return <span>{truncateString(result.name, 150)}</span>
     }
 
-    return <div className="container">
+    return <div className="page-container-narrow">
         <PageTitle icon="fa fa-search" title="General Search" help={true} helpClickedHandler={helpClickedHandler}></PageTitle>
         
         <GeneralSearchPageTourComponent run={runTutorial} callback={helpTourCallback}></GeneralSearchPageTourComponent>
diff --git a/ontology-manager-client/src/pages/visualization/co-ocurrences-summary/co-ocurrence-summary-page.component.tsx b/ontology-manager-client/src/pages/visualization/co-ocurrences-summary/co-ocurrence-summary-page.component.tsx
index 662ce79..f32943d 100644
--- a/ontology-manager-client/src/pages/visualization/co-ocurrences-summary/co-ocurrence-summary-page.component.tsx
+++ b/ontology-manager-client/src/pages/visualization/co-ocurrences-summary/co-ocurrence-summary-page.component.tsx
@@ -28,6 +28,7 @@ import { ILocalStorageStore, ITutorialStore, LOCAL_STORAGE_KEYS, STORES } from '
         
 import * as XLSX from 'xlsx';
 import { useNavigate } from 'react-router-dom';
+import { toolDisclaimer } from '../../../utils';
         
 const React = require('react');
 
@@ -69,11 +70,7 @@ const CoOcurrenceSummaryPageComponent: React.FC = () => {
         confirmDialog({
             header: 'Disclaimer',
             icon: 'pi pi-exclamation-triangle',
-            message: (
-                <p>
-                    This tool shows connections of existing data which could be <b>erroneous</b>, <b>biased</b> <br/> and <b>not necessarily the most relevant</b> one for your scientific question since  it <br/>  was <b>generated with an automatic process</b>. <br/> We are actively working to improve the data quality in the platform.
-                </p>
-            ),
+            message: toolDisclaimer,
             acceptLabel: "Understood",
             rejectLabel: "Back",
             accept: () => {
@@ -323,7 +320,7 @@ const CoOcurrenceSummaryPageComponent: React.FC = () => {
     return (
         <>
             <CoOccurrencesSummaryTour run={runTutorial} callback={helpTourCallback}></CoOccurrencesSummaryTour>
-        <div className='page-container'>
+        <div className='page-container-wide'>
 
             <PageTitle title='Co-Occurrences Summary' icon='fa fa-circle-nodes' help={true} helpClickedHandler={helpClickedHandler}></PageTitle>
 
@@ -393,6 +390,17 @@ const CoOcurrenceSummaryPageComponent: React.FC = () => {
                                 model={downloadOptions} 
                                 tooltip="Download query results"
                                 tooltipOptions={{position: 'bottom', showDelay: 1000}}
+                                onClick={async () => {
+
+            
+                                    const results = await ontologyService.getCoOccurrencesDetails({leftTypeQuery: leftTypeQuery, rightTypeQuery: rightTypeQuery}, messageService!);
+                    
+                                    const ws = XLSX.utils.json_to_sheet(results);
+                                    const wb = XLSX.utils.book_new();
+                                    XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+                                    XLSX.writeFile(wb, 'co-ocurrences.xlsx');
+                    
+                                }}
                             />
                             </div>
                             
diff --git a/ontology-manager-client/src/pages/visualization/neighborhood-explorer/neighborhood-explorer-page.component.tsx b/ontology-manager-client/src/pages/visualization/neighborhood-explorer/neighborhood-explorer-page.component.tsx
index 9d1201f..7807f88 100644
--- a/ontology-manager-client/src/pages/visualization/neighborhood-explorer/neighborhood-explorer-page.component.tsx
+++ b/ontology-manager-client/src/pages/visualization/neighborhood-explorer/neighborhood-explorer-page.component.tsx
@@ -11,6 +11,7 @@ import NeighborhoodExplorerTour from "../../../features/modules/visualization/ne
 import { ILocalStorageStore, ITutorialStore, LOCAL_STORAGE_KEYS, STORES } from "../../../stores";
 import { confirmDialog } from "primereact/confirmdialog";
 import { useNavigate } from "react-router-dom";
+import { toolDisclaimer } from "../../../utils";
 
 const React = require('react');
 
@@ -48,11 +49,7 @@ const NeighborhoodExplorerPageComponent: React.FC = () => {
         confirmDialog({
             header: 'Disclaimer',
             icon: 'pi pi-exclamation-triangle',
-            message: (
-                <p>
-                    This tool shows connections of existing data which could be <b>erroneous</b>, <b>biased</b> <br/> and <b>not necessarily the most relevant</b> one for your scientific question since  it <br/>  was <b>generated with an automatic process</b>. <br/> We are actively working to improve the data quality in the platform.
-                </p>
-            ),
+            message: toolDisclaimer,
             acceptLabel: "Understood",
             rejectLabel: "Back",
             accept: () => {
@@ -66,7 +63,7 @@ const NeighborhoodExplorerPageComponent: React.FC = () => {
     };
 
     return (
-        <div className='page-container'>
+        <div className='page-container-wide'>
             <PageTitle icon="fa fa-compass" title="Neighborhood Explorer" help={true} helpClickedHandler={helpClickedHandler}></PageTitle>
 
             <NeighborhoodExplorerTour run={runTutorial} callback={helpTourCallback}></NeighborhoodExplorerTour>
diff --git a/ontology-manager-client/src/services/modules/visualization/entity-service.ts b/ontology-manager-client/src/services/modules/visualization/entity-service.ts
index e43bac9..27f5165 100644
--- a/ontology-manager-client/src/services/modules/visualization/entity-service.ts
+++ b/ontology-manager-client/src/services/modules/visualization/entity-service.ts
@@ -1,12 +1,29 @@
 
 import { injectable } from "inversify";
 import { GraphService } from "../../interfaces/graph-service";
+import { MessageService } from "../../../features/shared/messages";
+import { IHttpResponseHandlerSettings, OnReadByIdResponsesHandler } from "../../../features/shared/http/http-responses-handler";
+import axios from "axios";
 
 @injectable()
 export class IEntityService extends GraphService{
     url: string = "api/entity"
     entityTitle: string = "Entity";
+
+    getGraphReferences(nodes: string[], messageService: MessageService,  httpResponseHandlerSettings? : IHttpResponseHandlerSettings) : any {
+        return this.handleRequest<any>(
+            axios.post<any>(
+                `${this.url}/get-graph-references`, nodes 
+            ),
+            new OnReadByIdResponsesHandler("graph", messageService, httpResponseHandlerSettings)
+        );
+    }
+
+
 };
 
 @injectable()
-export class EntityService extends IEntityService {}
\ No newline at end of file
+export class EntityService extends IEntityService {
+
+
+}
\ No newline at end of file
diff --git a/ontology-manager-client/src/utils/constants/mesages.tsx b/ontology-manager-client/src/utils/constants/mesages.tsx
new file mode 100644
index 0000000..092c953
--- /dev/null
+++ b/ontology-manager-client/src/utils/constants/mesages.tsx
@@ -0,0 +1,5 @@
+export const toolDisclaimer = <p>
+At the moment, this tool is still primarily focused on the analysis of data of Cuban plants. Hence, the output for plants from other geographical regions might be weaker. <br/>
+This tool shows connections of available data which could be <b>erroneous</b>, <b>biased</b>  and <b>not necessarily the most relevant</b> one for your scientific question  <br/> since  it  was <b>extracted from available data sources with an automatic process</b>. 
+<br/> We are actively working to expand the data basis (please contribute!) and improve the data quality of the platform.
+</p>
\ No newline at end of file
diff --git a/ontology-manager-client/src/utils/index.ts b/ontology-manager-client/src/utils/index.ts
index 715006e..65f3154 100644
--- a/ontology-manager-client/src/utils/index.ts
+++ b/ontology-manager-client/src/utils/index.ts
@@ -1,3 +1,4 @@
 export { flatten, constructHttpParams } from "./flatten";
 export { getRandomColor, darkenHexColor,getContrastColor} from "./color";
-export { truncateString } from "./string";
\ No newline at end of file
+export { truncateString } from "./string";
+export {toolDisclaimer } from './constants/mesages';
\ No newline at end of file
diff --git a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/api/EntityController.java b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/api/EntityController.java
index 2bca2aa..3ca1953 100644
--- a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/api/EntityController.java
+++ b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/api/EntityController.java
@@ -4,8 +4,11 @@
 import ipbhalle.de.ontologymanagerserver.data.dtos.CoOcurrenceQuery;
 import ipbhalle.de.ontologymanagerserver.data.dtos.EntityDTO;
 import ipbhalle.de.ontologymanagerserver.data.dtos.GraphDTO;
+import ipbhalle.de.ontologymanagerserver.data.dtos.LinkDTO;
 import ipbhalle.de.ontologymanagerserver.services.interfaces.IEntityService;
 import ipbhalle.de.ontologymanagerserver.services.interfaces.IOntologyService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -22,4 +25,9 @@ public EntityController(IEntityService entityService) {
         this.entityService = entityService;
     }
 
+    @PostMapping("get-graph-references")
+    public ResponseEntity<List<LinkDTO>> GetGraphReferences(@RequestBody List<String> nodes) {
+        return new ResponseEntity<>(entityService.GetGraphReferences(nodes), HttpStatus.OK);
+    }
+
 }
diff --git a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/data/interfaces/IEntityRepository.java b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/data/interfaces/IEntityRepository.java
index 1732662..e3e2582 100644
--- a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/data/interfaces/IEntityRepository.java
+++ b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/data/interfaces/IEntityRepository.java
@@ -1,6 +1,7 @@
 package ipbhalle.de.ontologymanagerserver.data.interfaces;
 
 import ipbhalle.de.ontologymanagerserver.data.dtos.EntitySearchResultDTO;
+import ipbhalle.de.ontologymanagerserver.data.dtos.LinkDTO;
 import ipbhalle.de.ontologymanagerserver.data.dtos.NaturalProductDTO;
 
 import java.util.List;
@@ -8,5 +9,5 @@
 
 public interface IEntityRepository extends IGraphRepository{
     List<EntitySearchResultDTO> GetByIds(List<String> ids);
-    List<NaturalProductDTO> GetIds(List<String> uuids);
+    List<LinkDTO> GetGraphReferences(List<String> nodesIds);
 }
diff --git a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JEntityRepository.java b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JEntityRepository.java
index d13dfca..7c6df84 100644
--- a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JEntityRepository.java
+++ b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JEntityRepository.java
@@ -7,8 +7,8 @@
 import ipbhalle.de.ontologymanagerserver.n4j.models.N4JEntityType;
 import ipbhalle.de.ontologymanagerserver.n4j.models.N4JPropertyInfo;
 import ipbhalle.de.ontologymanagerserver.n4j.models.N4JPropertyValue;
+import org.neo4j.cypherdsl.core.*;
 import org.neo4j.driver.internal.value.MapValue;
-import org.neo4j.driver.util.Pair;
 import org.springframework.data.neo4j.core.Neo4jTemplate;
 import org.springframework.stereotype.Repository;
 
@@ -50,33 +50,61 @@ public GraphDTO GetAdjacentNodes(String nodeId, List<String> nodesIds) {
 
         HashSet<String> existentNodes = new HashSet<>(nodesIds);
 
-        // Get adjacent nodes to the expanded node
-        String adjacentEntitiesQuery = "match(n) - [r] - (m:Entity) where id(n) = "
-                + nodeId +
-                " with m, keys(properties(m)) AS attributeKeys UNWIND attributeKeys AS key return toString(id(m)) as id, labels(m) as labels,   collect({name: key, value: properties(m)[key]}) AS properties;";
-        var adjacentEntities = neo4jTemplate.findAll(adjacentEntitiesQuery, N4JEntity.class);
 
-        // From all adjacent nodes get the ones that are not in the graph already
-        var newEntities = adjacentEntities.stream().filter(x -> !existentNodes.contains(x.getId())).toList();
-        var newEntitiesIds = newEntities.stream().map(N4JEntity::getId).toList();
+        Parameter<String> nodeIdParam = Cypher.parameter("nodeId", nodeId);
+        Node nodeX = Cypher.node("Entity").named("x");
+        Node nodeY = Cypher.node("Entity").named("y");
 
+        Statement adjacentEntitiesQueryDSL = Cypher
+                .match(nodeX.relationshipBetween(nodeY))
+                .where(nodeX.property("OHUUID").isEqualTo(nodeIdParam))
+                .with(
+                        nodeY,
+                        Functions.keys(Functions.properties(nodeY)).as("attributeKeys")
+                )
+                .unwind(Cypher.name("attributeKeys")).as("key")
+                .returning(
+                        nodeY.property("OHUUID").as("id"),
+                        Functions.labels(nodeY).as("labels"),
+                        Functions.collect(Cypher.mapOf("name", Cypher.name("key"), "value", nodeY.property(Cypher.name("key")))).as("properties")
+                )
+                .build();
 
-        String newOutgoingLinksQuery =
-                "with [" + String.join(", ", newEntitiesIds) + "] as newNodesIds, " +
-                "[" + String.join(", ", nodesIds) + "] as nodesIds " +
-                "match(n) - [r] -> (m:Entity) where " +
-                        "(id(n) in newNodesIds or id(n) in nodesIds) and id(m) in newNodesIds " +
-                        "with toString(id(n)) as source, toString(id(m)) as target, type(r) as label, count(r) as value" +
-                " return source, target, label, value;";
+        var adjacentEntities = neo4jTemplate.findAll(adjacentEntitiesQueryDSL, N4JEntity.class);
 
-        String newIncomingLinksQuery =
-                "with [" + String.join(", ", newEntitiesIds) + "] as newNodesIds, " +
-                        "[" + String.join(", ", nodesIds) + "] as nodesIds " +
-                        "match (m:Entity) - [r] -> (n) where " +
-                        "id(n) in nodesIds and id(m) in newNodesIds " +
-                        "with toString(id(n)) as target, toString(id(m)) as source, type(r) as label, count(r) as value" +
-                        " return source, target, label, value;";
+        // From all adjacent nodes get the ones that are not in the graph already
+        var newEntities = adjacentEntities.stream().filter(x -> !existentNodes.contains(x.getId())).toList();
+        var newEntitiesIds = newEntities.stream().map(N4JEntity::getId).toList();
 
+        Parameter<List<String>> newNodesIdsParam = Cypher.parameter("newNodesIds", newEntitiesIds);
+        Parameter<List<String>> oldNodesIdsParam = Cypher.parameter("oldNodesIds", nodesIds);
+        Relationship linkR = nodeX.relationshipTo(nodeY).named("r");
+
+        Statement newOutgoingLinksQuery = Cypher
+                .match(linkR)
+                .where(
+                        (nodeX.property("OHUUID").in(newNodesIdsParam).or(nodeX.property("OHUUID").in(oldNodesIdsParam)))
+                                .and(nodeY.property("OHUUID").in(newNodesIdsParam))
+                )
+                .returning(
+                        nodeX.property("OHUUID").as("source"),
+                        nodeY.property("OHUUID").as("target"),
+                        Functions.type(linkR).as("label"),
+                        Functions.count(nodeX).as("value")
+                ).build();
+
+        Statement newIncomingLinksQuery = Cypher
+                .match(linkR)
+                .where(
+                        nodeX.property("OHUUID").in(newNodesIdsParam)
+                                .and(nodeY.property("OHUUID").in(oldNodesIdsParam))
+                )
+                .returning(
+                        nodeX.property("OHUUID").as("source"),
+                        nodeY.property("OHUUID").as("target"),
+                        Functions.type(linkR).as("label"),
+                        Functions.count(nodeX).as("value")
+                ).build();
 
         var outgoingLinks = neo4jTemplate.findAll(newOutgoingLinksQuery, GraphLinkDTO.class);
         var incomingLinks = neo4jTemplate.findAll(newIncomingLinksQuery, GraphLinkDTO.class);
@@ -113,18 +141,82 @@ public GraphDTO GetAdjacentNodes(String nodeId, List<String> nodesIds) {
     }
 
     @Override
-    public EntityDTO GetNode(String nodeId) {
-        String nodeQuery = "match (m:Entity) where id(m) = "
-                + nodeId +
-                " with m, keys(properties(m)) AS attributeKeys UNWIND attributeKeys AS key return toString(id(m)) as id, labels(m) as labels,   collect({name: key, value: properties(m)[key]}) AS properties;";
+    public List<LinkDTO> GetGraphReferences(List<String> nodesIds){
+        HashMap<String, String> labels = new HashMap<>();
+
+        var nodeTypes = neo4jTemplate.findAll(N4JEntityType.class);
+
+        Parameter<List<String>> nodesIdsParam = Cypher.parameter("nodesIds", nodesIds);
+        Node nodeX = Cypher.node("Entity").named("x");
+        Node nodeY = Cypher.node("Entity").named("y");
+        Relationship referenceRelationship = nodeX.relationshipTo(nodeY).named("r");
 
-        var entity = neo4jTemplate.findOne(nodeQuery,new HashMap<>(), N4JEntity.class);
+        Case nodeXLabelCaseStatement =
+                Case.create(nodeX.property("__type"));
 
+        Case nodeYLabelCaseStatement =
+                Case.create(nodeY.property("__type"));
+
+        for (var entityType: nodeTypes) {
+            nodeXLabelCaseStatement = nodeXLabelCaseStatement
+                    .when(Cypher.literalOf(entityType.getId()))
+                    .then(nodeX.property(entityType.getLabel().getName()));
+
+            nodeYLabelCaseStatement = nodeYLabelCaseStatement
+                    .when(Cypher.literalOf(entityType.getId()))
+                    .then(nodeY.property(entityType.getLabel().getName()));
+        }
 
-        String referencesQuery = "match (m:Entity) -[r:FROM_SOURCE]-> (n:Source) where id(m) = " + nodeId +
-                " return r.source as source, r.url as sourceUrl, r.externalid as externalId";
+        Statement getGraphReferencesQuery = Cypher
+                .match(referenceRelationship)
+                .where(nodeX.property("OHUUID").in(nodesIdsParam).and(nodeY.property("OHUUID").in(nodesIdsParam)))
+                .returning(
+                        nodeXLabelCaseStatement.as("leftEntity"),
+                        nodeYLabelCaseStatement.as("rightEntity"),
+                        Functions.type(referenceRelationship).as("type"),
+                        referenceRelationship.property("source").as("sourceName"),
+                        referenceRelationship.property("sourceurl").as("sourceUrl")
+                ).build();
 
-        var references = neo4jTemplate.findAll(referencesQuery, ReferenceDTO.class);
+        return neo4jTemplate.findAll(getGraphReferencesQuery, LinkDTO.class);
+
+    }
+
+    @Override
+    public EntityDTO GetNode(String nodeId) {
+
+        Parameter<String> nodeIdParam = Cypher.parameter("nodeId", nodeId);
+        Node entityNode = Cypher.node("Entity").named("e");
+        Statement getNodeQuery = Cypher
+                .match(entityNode)
+                .where(entityNode.property("OHUUID").isEqualTo(nodeIdParam))
+                .with(
+                        entityNode,
+                        Functions.keys(Functions.properties(entityNode)).as("attributeKeys")
+                )
+                .unwind(Cypher.name("attributeKeys")).as("key")
+                .returning(
+                        entityNode.property("OHUUID").as("id"),
+                        Functions.labels(entityNode).as("labels"),
+                        Functions.collect(Cypher.mapOf("name", Cypher.name("key"), "value", entityNode.property(Cypher.name("key")))).as("properties")
+                )
+                .build();
+
+        var entity = neo4jTemplate.findOne(getNodeQuery, new HashMap<>(), N4JEntity.class);
+
+        Node sourceNode = Cypher.node("Source").named("s");
+        Relationship fromSourceRelationship = entityNode.relationshipTo(sourceNode, "FROM_SOURCE").named("r");
+
+        Statement getReferencesQuery = Cypher
+                .match(fromSourceRelationship)
+                .where(entityNode.property("OHUUID").isEqualTo(nodeIdParam))
+                .returning(
+                        fromSourceRelationship.property("source").as("source"),
+                        fromSourceRelationship.property("url").as("sourceUrl"),
+                        fromSourceRelationship.property("externalid").as("externalId")
+                ).build();
+
+        var references = neo4jTemplate.findAll(getReferencesQuery, ReferenceDTO.class);
 
         if (entity.isEmpty())
             return null;
@@ -177,12 +269,26 @@ public GraphLinkDTO GetLink(String linkId) {
 
     @Override
     public List<LinkDTO> GetLinks(String sourceId, String targetId, String type) {
-        String query = "match (n)-[r]-(m) where id(n) = " + sourceId + " and id(m) = " + targetId;
-        if (type != null)
-            query += " and type(r) = '" + type + "'";
-        query += " return toString(id(n)) as rightEntity, toString(id(m)) as leftEntity, type(r) as type, r.source as sourceName, r.sourceurl as sourceUrl";
 
-        return neo4jTemplate.findAll(query, LinkDTO.class);
+        Parameter<String> sourceIdParam = Cypher.parameter("sourceId", sourceId);
+        Parameter<String> targetIdParam = Cypher.parameter("targetId", targetId);
+
+        Node sourceNode = Cypher.node("Entity").named("x");
+        Node targetNode = Cypher.node("Entity").named("y");
+        Relationship referenceRelationship = sourceNode.relationshipBetween(targetNode).named("r");
+
+        Statement getLinkReferencesQuery = Cypher
+                .match(referenceRelationship)
+                .where(sourceNode.property("OHUUID").isEqualTo(sourceIdParam).and(targetNode.property("OHUUID").isEqualTo(targetIdParam)))
+                .returning(
+                        sourceNode.property("OHUUID").as("leftEntity"),
+                        sourceNode.property("OHUUID").as("rightEntity"),
+                        Functions.type(referenceRelationship).as("type"),
+                        referenceRelationship.property("source").as("sourceName"),
+                        referenceRelationship.property("sourceurl").as("sourceUrl")
+                ).build();
+
+        return neo4jTemplate.findAll(getLinkReferencesQuery, LinkDTO.class);
     }
 
     @Override
@@ -199,13 +305,26 @@ public List<EntitySearchResultDTO> GetByIds(List<String> ids) {
             types.put(x.getId(), x.getName());
         });
 
-        var stringifyIds = ids.stream().map(x -> "'" + x + "'").toList();
 
-        String query =
-        "with [" + String.join(", ", stringifyIds)  + "] as matches" +
-                " match(m:Entity) where m.OHUUID in matches" +
-                " with m, keys(properties(m)) AS attributeKeys UNWIND attributeKeys AS key return toString(id(m)) as id, labels(m) as labels,   collect({name: key, value: properties(m)[key]}) AS properties;";
-        var matchedEntities = neo4jTemplate.findAll(query, N4JEntity.class);
+
+        Parameter<List<String>> nodeIdsParam = Cypher.parameter("nodeIds", ids);
+        Node node = Cypher.node("Entity").named("n");
+        Statement queryDSL = Cypher
+                .match(node)
+                .where(node.property("OHUUID").in(nodeIdsParam))
+                .with(
+                        node,
+                        Functions.keys(Functions.properties(node)).as("attributeKeys")
+                )
+                .unwind(Cypher.name("attributeKeys")).as("key")
+                .returning(
+                        node.property("OHUUID").as("id"),
+                        Functions.labels(node).as("labels"),
+                        Functions.collect(Cypher.mapOf("name", Cypher.name("key"), "value", node.property(Cypher.name("key")))).as("properties")
+                )
+                .build();
+
+        var matchedEntities = neo4jTemplate.findAll(queryDSL, N4JEntity.class);
 
 
         var newNodes = matchedEntities.stream().map(n -> {
@@ -238,16 +357,4 @@ public List<EntitySearchResultDTO> GetByIds(List<String> ids) {
         return newNodes;
     }
 
-    public List<NaturalProductDTO> GetIds(List<String> uuids){
-        var stringifyIds = uuids.stream().map(x -> "'" + x + "'").toList();
-
-        var query =
-              "with [" + String.join(", ", stringifyIds)  + "] as matches" +
-                      " match(m:`Natural Product`) where m.OHUUID in matches" +
-                      " return m.Name as name, m.InChI as inChI, m.`InChI Key` as inChIKey, m.`SMILES` as smiles, m.`Molecular Formula` as molecularFormula, toFloat(m.`Molecular Weight`) as molecularWeight, m.`Cas Registry Number` as casRegistryNumber, m.`IUPAC Name` as iupacName , toString(id(m)) as id";
-
-
-        return neo4jTemplate.findAll(query, NaturalProductDTO.class);
-
-    }
 }
diff --git a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JOntologyRepository.java b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JOntologyRepository.java
index f64f601..f0103ae 100644
--- a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JOntologyRepository.java
+++ b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/n4j/repository/N4JOntologyRepository.java
@@ -3,13 +3,11 @@
 import ipbhalle.de.ontologymanagerserver.data.dtos.*;
 import ipbhalle.de.ontologymanagerserver.data.interfaces.IOntologyRepository;
 import ipbhalle.de.ontologymanagerserver.n4j.models.N4JEntityType;
-import org.neo4j.driver.QueryConfig;
+import org.neo4j.cypherdsl.core.*;
+
 import org.springframework.data.neo4j.core.Neo4jOperations;
 import org.springframework.stereotype.Repository;
-
-
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Stream;
@@ -17,7 +15,7 @@
 @Repository
 public class N4JOntologyRepository implements IOntologyRepository {
 
-    private Neo4jOperations neo4jOperations;
+    private final Neo4jOperations neo4jOperations;
 
     public N4JOntologyRepository(Neo4jOperations neo4jOperations) {
         this.neo4jOperations = neo4jOperations;
@@ -33,65 +31,44 @@ public List<EntityDTO> GetAsGraph() {
     @Override
     public GraphDTO FindCoOccurrences(CoOcurrenceQuery query) {
 
-        StringBuilder result = new StringBuilder();
-
-        result.append("MATCH ");
-
+        // TODO: Move this input sanitation to service layer :)
         query.getLeftTypeQuery().setFilters( query.getLeftTypeQuery().getFilters().stream().filter(x -> x.getValue() != null && !x.getValue().isEmpty()).toList());
         query.getRightTypeQuery().setFilters( query.getRightTypeQuery().getFilters().stream().filter(x -> x.getValue() != null && !x.getValue().isEmpty()).toList());
 
-
         var leftEntityType = neo4jOperations.findById(query.getLeftTypeQuery().getType(), N4JEntityType.class).get();
         var rightEntityType = neo4jOperations.findById(query.getRightTypeQuery().getType(), N4JEntityType.class).get();
 
+        Node nodeX = Cypher.node(leftEntityType.getName()).named("x");
+        Node nodeY = Cypher.node(rightEntityType.getName()).named("y");
+        Relationship coOccurrenceRelationship = nodeX.relationshipBetween(nodeY).named("r");
 
-        // match the type
-        result.append("(x:`").append(leftEntityType.getName()).append("`");
-        result.append(")");
-        // add the relationship
-        result.append("- [r] - ");
-        result.append("(y:`").append(rightEntityType.getName()).append("`");
-        result.append(")");
-
-        if ((query.getLeftTypeQuery().getFilters() != null && !query.getLeftTypeQuery().getFilters().isEmpty())
-                || (query.getRightTypeQuery().getFilters() != null && !query.getRightTypeQuery().getFilters().isEmpty()))
-            result.append(" WHERE ");
+        var conditions = Conditions.isTrue();
 
-        Stream<String> leftEntityCriteria = Stream.empty();
-
-        if (query.getLeftTypeQuery().getFilters() != null && !query.getLeftTypeQuery().getFilters().isEmpty()){
-            leftEntityCriteria = query.getLeftTypeQuery().getFilters().stream().map(
-                    x -> String.format("x.`%s` =~ '(?i).*%s.*'", x.getProperty(), x.getValue()));
+        for (var filter: query.getLeftTypeQuery().getFilters()){
+            conditions = conditions.and(
+                    nodeX.property(filter.getProperty()).matches("(?i).*" + filter.getValue() + ".*")
+            );
         }
 
-        Stream<String> rightEntityCriteria = Stream.empty();
-        if (query.getRightTypeQuery().getFilters() != null && !query.getRightTypeQuery().getFilters().isEmpty()){
-            rightEntityCriteria = query.getRightTypeQuery().getFilters().stream().map(
-                    x -> String.format("y.`%s` =~ '(?i).*%s.*'", x.getProperty(), x.getValue()));
+        for (var filter: query.getRightTypeQuery().getFilters()){
+            conditions = conditions.and(
+                    nodeY.property(filter.getProperty()).matches("(?i).*" + filter.getValue() + ".*")
+            );
         }
 
-        var filters = Stream.concat(leftEntityCriteria, rightEntityCriteria).toList();
-
-        result.append(String.join(" AND ", filters));
-
-        result.append(" WITH type(r) AS label, count(r) AS value, ");
-
-        var leftNodeIdentifier = !query.getLeftTypeQuery().getGroupBy().isEmpty() ?
-                String.format("x.`%s`", query.getLeftTypeQuery().getGroupBy()) :
-                String.format("x.`%s`", leftEntityType.getLabel().getName());
-
-        var rightNodeIdentifier = !query.getRightTypeQuery().getGroupBy().isEmpty() ?
-                String.format("y.`%s`", query.getRightTypeQuery().getGroupBy()) :
-                String.format("y.`%s`", rightEntityType.getLabel().getName());
-
-        result.append(leftNodeIdentifier).append(" AS source, ");
-        result.append(rightNodeIdentifier).append(" AS target ");
+        var getCoOccurrencesQuery = Cypher
+                .match(coOccurrenceRelationship)
+                .where(conditions)
+                .returning(
+                        Functions.type(coOccurrenceRelationship).as("label"),
+                        Functions.count(coOccurrenceRelationship.asExpression()).as("value"),
+                        nodeX.property(query.getLeftTypeQuery().getGroupBy().isEmpty() ? leftEntityType.getLabel().getName() : query.getLeftTypeQuery().getGroupBy()).as("source"),
+                        nodeY.property(query.getRightTypeQuery().getGroupBy().isEmpty() ? rightEntityType.getLabel().getName() : query.getRightTypeQuery().getGroupBy()).as("target")
+                ).build();
 
 
-        result.append("RETURN source, target, label, value");
 
-
-        var links = neo4jOperations.findAll(result.toString(), GraphLinkDTO.class);
+        var links = neo4jOperations.findAll(getCoOccurrencesQuery, GraphLinkDTO.class);
 
         var sourceNodeLabels = new HashSet<>(links.stream().map(GraphLinkDTO::getSource).toList());
         var targetNodeLabels = new HashSet<>(links.stream().map(GraphLinkDTO::getTarget).toList());
@@ -109,65 +86,46 @@ public GraphDTO FindCoOccurrences(CoOcurrenceQuery query) {
     }
 
     public List<LinkDTO> FindCoOccurrencesDetails(CoOcurrenceQuery query) {
-        StringBuilder result = new StringBuilder();
-
-        result.append("MATCH ");
-
-        query.getLeftTypeQuery().setFilters( query.getLeftTypeQuery().getFilters().stream().filter(x -> !x.getValue().isEmpty()).toList());
-        query.getRightTypeQuery().setFilters( query.getRightTypeQuery().getFilters().stream().filter(x -> !x.getValue().isEmpty()).toList());
+        query.getLeftTypeQuery().setFilters( query.getLeftTypeQuery().getFilters().stream().filter(x -> x.getValue() != null && !x.getValue().isEmpty()).toList());
+        query.getRightTypeQuery().setFilters( query.getRightTypeQuery().getFilters().stream().filter(x -> x.getValue() != null && !x.getValue().isEmpty()).toList());
 
 
         var leftEntityType = neo4jOperations.findById(query.getLeftTypeQuery().getType(), N4JEntityType.class).get();
         var rightEntityType = neo4jOperations.findById(query.getRightTypeQuery().getType(), N4JEntityType.class).get();
 
-        // match the type
-        result.append("(x:`").append(leftEntityType.getName()).append("`");
-        result.append(")");
-        // add the relationship
-        result.append("- [r] - ");
-        result.append("(y:`").append(rightEntityType.getName()).append("`");
-        result.append(")");
+        Node nodeX = Cypher.node(leftEntityType.getName()).named("x");
+        Node nodeY = Cypher.node(rightEntityType.getName()).named("y");
+        Relationship coOccurrenceRelationship = nodeX.relationshipBetween(nodeY).named("r");
 
-        if ((query.getLeftTypeQuery().getFilters() != null && !query.getLeftTypeQuery().getFilters().isEmpty())
-            || (query.getRightTypeQuery().getFilters() != null && !query.getRightTypeQuery().getFilters().isEmpty()))
-            result.append(" WHERE ");
 
-        Stream<String> leftEntityCriteria = Stream.empty();
+        var conditions = Conditions.isTrue();
 
-        if (query.getLeftTypeQuery().getFilters() != null && !query.getLeftTypeQuery().getFilters().isEmpty()){
-            leftEntityCriteria = query.getLeftTypeQuery().getFilters().stream().map(
-                    x -> String.format("x.`%s` =~ '(?i).*%s.*'", x.getProperty(), x.getValue()));
+        for (var filter: query.getLeftTypeQuery().getFilters()){
+            conditions = conditions.and(
+                    nodeX.property(filter.getProperty()).matches("(?i).*" + filter.getValue() + ".*")
+            );
         }
 
-        Stream<String> rightEntityCriteria = Stream.empty();
-        if (query.getRightTypeQuery().getFilters() != null && !query.getRightTypeQuery().getFilters().isEmpty()){
-            rightEntityCriteria = query.getRightTypeQuery().getFilters().stream().map(
-                    x -> String.format("y.`%s` =~ '(?i).*%s.*'", x.getProperty(), x.getValue()));
+        for (var filter: query.getRightTypeQuery().getFilters()){
+            conditions = conditions.and(
+                    nodeY.property(filter.getProperty()).matches("(?i).*" + filter.getValue() + ".*")
+            );
         }
 
-        var filters = Stream.concat(leftEntityCriteria, rightEntityCriteria).toList();
-
-        result.append(String.join(" AND ", filters));
-
-
-        result.append(" WITH type(r) AS type, r.source as sourceName, r.sourceurl as sourceUrl, ");
-
-        var leftNodeIdentifier =
-                String.format("x.`%s`", leftEntityType.getLabel().getName());
-
-        var rightNodeIdentifier =
-                String.format("y.`%s`", rightEntityType.getLabel().getName());
-
-        result.append(leftNodeIdentifier).append(" AS leftEntity, ");
-        result.append(rightNodeIdentifier).append(" AS rightEntity ");
-
-
-        result.append("RETURN leftEntity, rightEntity, type, sourceName, sourceUrl");
+        var getCoOccurrencesDetailsQuery = Cypher
+                .match(coOccurrenceRelationship)
+                .where(conditions)
+                .returning(
+                        nodeX.property(leftEntityType.getLabel().getName()).as("leftEntity"),
+                        nodeY.property(rightEntityType.getLabel().getName()).as("rightEntity"),
+                        Functions.type(coOccurrenceRelationship).as("type"),
+                        coOccurrenceRelationship.property("source").as("sourceName"),
+                        coOccurrenceRelationship.property("sourceurl").as("sourceUrl")
 
-        var query2 = result.toString();
+                ).build();
 
 
-        var links = neo4jOperations.findAll(query2, LinkDTO.class);
+        var links = neo4jOperations.findAll(getCoOccurrencesDetailsQuery, LinkDTO.class);
 
         return links;
     }
diff --git a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/EntityService.java b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/EntityService.java
index 332020c..d36b915 100644
--- a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/EntityService.java
+++ b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/EntityService.java
@@ -44,4 +44,9 @@ public GraphLinkDTO GetLink(String nodeId) {
     public List<LinkDTO> GetLinks(String sourceId, String targetId, String type) {
         return entityRepository.GetLinks(sourceId, targetId, type);
     }
+
+    @Override
+    public List<LinkDTO> GetGraphReferences(List<String> nodesIds){
+        return entityRepository.GetGraphReferences(nodesIds);
+    }
 }
diff --git a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/NaturalProductService.java b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/NaturalProductService.java
index f6c2c07..9b63a55 100644
--- a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/NaturalProductService.java
+++ b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/NaturalProductService.java
@@ -31,11 +31,7 @@ public NaturalProductDTO GetBySMILES(String value) {
             throw new RuntimeException();
         }
 
-        var result =  this.naturalProductRepository.GetBySMILES(value);
-        if (result == null)
-            return null;
-        var ids = new String[] { result.getId()} ;
-        return this.entityRepository.GetIds(Arrays.stream(ids).toList()).get(0);
+        return this.naturalProductRepository.GetBySMILES(value);
     }
 
     @Override
@@ -43,11 +39,7 @@ public NaturalProductDTO GetByInChI(String value) {
         if (StringProcessing.isSQLInjection(value)) {
             throw new RuntimeException();
         }
-        var result = this.naturalProductRepository.GetByInChI(value);
-        if (result == null)
-            return null;
-        var ids = new String[] { result.getId()} ;
-        return this.entityRepository.GetIds(Arrays.stream(ids).toList()).get(0);
+        return this.naturalProductRepository.GetByInChI(value);
     }
 
     @Override
@@ -55,11 +47,7 @@ public NaturalProductDTO GetByInChIKey(String value) {
         if (StringProcessing.isSQLInjection(value)) {
             throw new RuntimeException();
         }
-        var result = this.naturalProductRepository.GetByInChIKey(value);
-        if (result == null)
-            return null;
-        var ids = new String[] { result.getId()} ;
-        return this.entityRepository.GetIds(Arrays.stream(ids).toList()).get(0);
+        return this.naturalProductRepository.GetByInChIKey(value);
     }
 
     @Override
@@ -69,9 +57,7 @@ public List<NaturalProductDTO> GetBySubstructure(String smiles, int take, int pa
         }
         page = 0;
         take = Math.min(take, 1000);
-        var result = this.naturalProductRepository.GetBySubstructure(smiles, take, page);
-        var ids = result.stream().map(NaturalProductDTO::getId);
-        return this.entityRepository.GetIds(ids.toList());
+        return this.naturalProductRepository.GetBySubstructure(smiles, take, page);
     }
 
     @Override
@@ -82,8 +68,6 @@ public List<NaturalProductDTO> GetBySimilarity(String smiles, int threshold, int
         if (threshold < 0 || threshold > 100)
             threshold = 80;
         limit = Math.min(limit, 1000);
-        var result = this.naturalProductRepository.GetBySimilarity(smiles, threshold, limit);
-        var ids = result.stream().map(NaturalProductDTO::getId);
-        return this.entityRepository.GetIds(ids.toList());
+        return this.naturalProductRepository.GetBySimilarity(smiles, threshold, limit);
     }
 }
diff --git a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/interfaces/IEntityService.java b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/interfaces/IEntityService.java
index 1a7bfa4..bd380d4 100644
--- a/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/interfaces/IEntityService.java
+++ b/ontology-manager-server/src/main/java/ipbhalle/de/ontologymanagerserver/services/interfaces/IEntityService.java
@@ -1,4 +1,9 @@
 package ipbhalle.de.ontologymanagerserver.services.interfaces;
 
+import ipbhalle.de.ontologymanagerserver.data.dtos.LinkDTO;
+
+import java.util.List;
+
 public interface IEntityService extends IGraphService{
+    List<LinkDTO> GetGraphReferences(List<String> nodesIds);
 }
diff --git a/ontology-manager-server/src/main/resources/application-dev.properties b/ontology-manager-server/src/main/resources/application-dev.properties
index 9bd982a..e550789 100644
--- a/ontology-manager-server/src/main/resources/application-dev.properties
+++ b/ontology-manager-server/src/main/resources/application-dev.properties
@@ -12,6 +12,9 @@ spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 
+logging.level.org.springframework.data.neo4j.cypher.deprecation=OFF
+logging.level.org.springframework.data.neo4j.cypher.unrecognized=OFF
+
 
 spring.datasource.hikari.maximum-pool-size=20
 spring.datasource.hikari.minimum-idle=10