diff --git a/bib.php b/bib.php
index 8aeda6f1c..be2687717 100644
--- a/bib.php
+++ b/bib.php
@@ -1,6 +1,6 @@
 <?php
 error_reporting(E_ERROR);
-
+define(NUMBER_LEVELS, 4);
 function readCSV($filename, $delimiter)
 {
     if (!file_exists($filename) || !is_readable($filename))
@@ -35,4 +35,5 @@ function getCsv() {
     $csvFile = 'selectedData.csv';
     $csv= readCSV($csvFile, ",");
     return $csv;
-}
\ No newline at end of file
+}
+
diff --git a/head.php b/head.php
index 143f1ab8d..e02a387c5 100644
--- a/head.php
+++ b/head.php
@@ -56,6 +56,12 @@
 	$url = "https://dsomm.timo-pagel.de{$_SERVER['SCRIPT_NAME']}"; 
 	echo "<link rel='canonical' href=$url>";
 ?>
+<script>
+    $(function () {
+        $('[data-toggle="popover"]').popover({placement: "bottom", trigger: "hover"}).on('click', function () {
+            $(this).popover('toggle');
+        });
+    })</script>
 </head>
 
 <?php
@@ -113,7 +119,7 @@ function getTable($dimensions) {
 			$tableContent .= "$subdimension";
 			$tableContent .= "</td>";
 			
-			for($i = 1; $i <= 4; $i ++) {
+			for($i = 1; $i <= NUMBER_LEVELS; $i ++) {
 				$tableContent .= "<td><ul>";
 				foreach ( $element as $elementName => $content ) {
 					$content = getContentForLevelFromSubdimensions ( $i, $content, $elementName );
diff --git a/index.php b/index.php
index dfd88a0d0..a67fc2008 100644
--- a/index.php
+++ b/index.php
@@ -13,9 +13,4 @@
 echo "<h1>Activtities per Dimension</h1>";
 echo '<div class="extra">'.getInfos($dimensions) . '</div>';
 ?>
-<script>
-    $(function () {
-        $('[data-toggle="popover"]').popover({placement: "bottom", trigger: "hover"}).on('click', function () {
-            $(this).popover('toggle');
-        });
-    })</script>
+
diff --git a/mappings.php b/mappings.php
new file mode 100644
index 000000000..35b1129b9
--- /dev/null
+++ b/mappings.php
@@ -0,0 +1,59 @@
+<?php
+include_once "head.php";
+?>
+    <body>
+<?php
+include_once "navi.php";
+?>
+<?php
+include_once "data.php";
+include_once "detail.php";
+
+$mappingExists = array();
+$noMappingExists = array();
+?>
+<table class="table">
+<thead>
+<tr>
+    <th scope="col">Dimension</th>
+    <th scope="col">Subdimension</th>
+    <th scope="col">Actvity</th>
+    <th scope="col">SAMM 2</th>
+    <th scope="col">ISO 27001</th>
+</tr>
+</thead>
+<tbody>
+<?php
+function getFlattenedArray($array, $index) {
+    if(!array_key_exists($index, $array)) {
+        return "TODO";   
+    }
+
+    $return = "";
+    $potentialArray = $array[$index];
+    if(is_array($potentialArray)) {
+        foreach($potentialArray as $element => $content) {
+            $return .= "$content";
+        }
+    }else {
+        $return .= $potentialArray;
+    }
+    return $return;
+}
+
+foreach ($dimensions as $dimension => $subdimensions) {
+    foreach ($subdimensions as $subdimension => $activity) {
+       foreach ($activity as $activityName => $content) {
+        echo "<tr>";
+        echo "<td>$dimension</td>";
+        echo "<td>$subdimension</td>";
+        $tooltip = "<div class='popoverdetails'>" . build_table_tooltip ( $content ) . "</div>";
+	    echo "<td><div data-toggle=\"popover\" data-title=\"$activityName\" data-content=\"$tooltip\" type=\"button\" data-html=\"true \">" . $activityName . "</div></td>";
+           echo "<td>" . getFlattenedArray($content, "samm2") . "</td>";
+           echo "<td>" . getFlattenedArray($content, "iso27001-2017") . "</td>";
+        }
+    }
+}
+
+echo "</table>";
+//var_dump($noMappingExists);
\ No newline at end of file
diff --git a/navi.php b/navi.php
index 131f862a7..b72091989 100644
--- a/navi.php
+++ b/navi.php
@@ -4,7 +4,8 @@
 $nav = array(
     "index.php" => "Matrix",
     "spiderweb.php" => "Implementation Levels",
-    "scutter.php" => "Ease and Value of Implementation",
+    "scutter.php" => "Ease and Value",
+    "mappings.php" => "Mappings",
     "graph.php" => "Dependencies",
     "report.php" => "Full Report",
     //"usefulnessHardness.php" => "Heatmap",
@@ -13,7 +14,7 @@
 ?>
 <ul class="nav nav-tabs">
 
-<a class="navbar-brand" href="https://dsomm.timo-pagel.de">
+<a class="navbar-brand" href="#">
     <img height="100%" src="/assets/images/logo.png" alt="OWASP DevSecOps Maturity Model">
 </a>
 <?php
