diff --git a/public/callback/main.js b/public/callback/main.js
index 395b862..c556fb7 100644
--- a/public/callback/main.js
+++ b/public/callback/main.js
@@ -1,4 +1,3 @@
-import { registerPipeline } from '../modules/storage.js'
 
 const showDebugInformation = false;
 
@@ -11,53 +10,30 @@ window.onload = async function () {
             technicalInformationTextArea.value += key + ": " + value + "\n";
         });
     }
+    const token = localStorage.getItem("git-api-token");
+    const instanceType = parameters.get("type");
+    localStorage.setItem("instance-type", instanceType);
+    if(instanceType=="github"){
+        const owner = parameters.get("owner");
+        const repo = parameters.get("repo");
+        const artifactId = parameters.get("artifactId");
+        console.log(owner, repo, artifactId);
+        localStorage.setItem("owner", owner);
+        localStorage.setItem("repo", repo);
+        localStorage.setItem("artifactId", artifactId);
+        window.location = "../curation/";
+
+
+    }else{
+        const url = parameters.get("url");
+        const repo = parameters.get("repo");
+        const artifactId = parameters.get("artifactId");
+        console.log(url, repo, artifactId);
+        localStorage.setItem("url", url);
+        localStorage.setItem("repo", repo);
+        localStorage.setItem("artifactId", artifactId);
+        window.location = "../curation/";
 
-    const gitLabProjectId = parameters.get("gitlab_project_id");
-    
-    const get_latest = parameters.get("latest");
 
-    const gitLabPipelineId = parameters.get("gitlab_pipeline_id");
-    const gitLabJobId = parameters.get("gitlab_job_id");
-
-    if(get_latest != 1){
-    await registerPipeline(gitLabProjectId, gitLabPipelineId, gitLabJobId);
-    }
-
-    if (showDebugInformation) {
-        await new Promise(r => setTimeout(r, 5000));
-    }
-
-    const token = localStorage.getItem("gitlab-api-token");
-    if (token) {
-        if(get_latest==1){
-            await latest(gitLabProjectId, token);
-        }else{
-        window.location = "../dashboard/";
-        }
-        return;
-    } else {
-        alert("Please set up the GitLab connection, then go to the dashboard!");
-        window.location = "../gitlab-setup/";
-        return;
     }
-
-    
-}
-
-async function latest(projectId, token) {
-    const jobResponse = await fetch(
-        `https://codebase.helmholtz.cloud/api/v4/projects/${projectId}/jobs/`,
-        { headers: { "Content-Type": "application/json", "PRIVATE-TOKEN": token } }
-    );
-
-    if (!jobResponse.ok) {
-        alert("Fetching pipeline failed");
-        return;
-    }
-
-    const jobData = await jobResponse.json();
-    const jobId = jobData[0]["id"];
-    const pipelineId = jobData[0]["pipeline"]["id"];
-    
-    window.location = `../callback?gitlab_project_id=${projectId}&gitlab_pipeline_id=${pipelineId}&gitlab_job_id=${jobId}&latest=2`;
 }
diff --git a/public/curation/curation.js b/public/curation/curation.js
index 80186cd..baf2450 100644
--- a/public/curation/curation.js
+++ b/public/curation/curation.js
@@ -5,10 +5,7 @@ import { addToBatch } from "./safe_comments.js";
 * Fetches json_document and displays their contents in a table.
 * @param {Path} json_document - document do fetch data from.
 */
-export function displayJSON(json_document){
-  fetch(json_document)
-  .then(response => response.json())
-  .then(data => {
+export function displayJSON(data){
       const colorPalette = ["rgb(34, 198, 227)", "purple", "rgb(23, 124, 207)", "rgb(116, 75, 196)", "pink"];
       let colorPolicies = {"Curation": "red"};
       if(data["policies"]){
@@ -18,10 +15,12 @@ export function displayJSON(json_document){
       console.log(colorPolicies);
       //Get data snippet from url
       const params = new URLSearchParams(location.search);
-      if(params.has("id")){
-        const id = params.get("id")
-        data = get_data_snippet(data, "@id", id);
-
+      if(params.size > 0){
+        for (const [key, value] of params) {
+          console.log("search for",key, value);
+          data = get_data_snippet(data, key, value);
+          }
+        
         //If your seeing a data snippet, create button to go back
         const back = document.createElement("button");
         back.innerText = "Back to Overview";
@@ -43,10 +42,15 @@ export function displayJSON(json_document){
 
       
       keys.forEach(element => { 
+        
         // Get a something with Name as p Header
         if(element.toLowerCase().includes("name")){
+          if(!Array.isArray(data[element])){
+          document.getElementById("project-name").innerHTML = element.charAt(0).toUpperCase() + element.slice(1) +' <b> '+data[element]+'</b>';
+      }else{
           document.getElementById("project-name").innerHTML = element.charAt(0).toUpperCase() + element.slice(1) +' <b> '+data[element][0]+'</b>';
-        }
+      }
+    }
         // Apply and fill in the template for Policies 
         if(element=="policies"){
           header.style.display = "block";
@@ -107,14 +111,18 @@ export function displayJSON(json_document){
         const slcomment = mvalue.querySelector("#single-line-comment"),
               slcommentPopup = mvalue.querySelector("#single-line-comment-popup");
         const input = mvalue.querySelector("#comment");
-        mvalue.querySelector('input[type="submit"]').addEventListener("click", () => {
-            addToBatch(element, data[element], input.value);
-          });
-        slcomment.addEventListener('click', (event)=>{
+                slcomment.addEventListener('click', (event)=>{
           event.stopPropagation();
-          console.log("clicked");
+          if (event.target !== slcomment) {
+              return;
+          }
           slcommentPopup.style.visibility = "visible";
         })
+        mvalue.querySelector('input[type="submit"]').addEventListener("click", () => {
+            addToBatch(element, data[element], input.value);
+            slcommentPopup.style.visibility = "hidden";
+          });
+
         document.addEventListener('click', function(e) {
           if ( slcommentPopup.style.visibility === "visible"  && !slcommentPopup.contains(e.target) ) {
               slcommentPopup.style.visibility = "hidden";
@@ -122,7 +130,7 @@ export function displayJSON(json_document){
         })
 
       })
-  })
+
   //Extend Checkbox for metadata source
   const checkbox = document.querySelector("#extended");
   checkbox.addEventListener('change', (event)=>{
@@ -152,9 +160,15 @@ function get_data_snippet(data, skey, svalue){
     const obj = stack.pop();
     for(let i=0; i<Object.keys(obj).length; i++){
       let key = Object.keys(obj)[i];
-      if(key==skey && obj[key][0]==svalue){
+      if(!Array.isArray(obj[key])){
+      if(key==skey && obj[key]==svalue){
+        return obj;
+      }
+      }else{
+        if(key==skey && obj[key][0]==svalue){
         return obj;
       }
+      }
       if (typeof obj[key] === 'object' && obj[key] !== null) {
         stack.push(obj[key]);
       }
diff --git a/public/curation/extract.js b/public/curation/extract.js
index 6685e48..ff9c1eb 100644
--- a/public/curation/extract.js
+++ b/public/curation/extract.js
@@ -62,6 +62,12 @@ function extract_info(cell, obj, tag, colorPolicies){
     tooltip.onclick = function(){link_to_person(e)};
     const tooltiptext = document.createElement("div");
     tooltiptext.classList.add("swc-tooltiptext");
+    Object.keys(e).forEach(k => {
+      if(!Array.isArray(e[k]) && typeof e[k] === "string"){
+      e[k] = [e[k]];
+    }
+    })
+    
     const text = document.createTextNode(`${e.familyName[0]}, ${e.givenName[0]} `);
     tooltiptag.appendChild(document.createTextNode("See Details"));
     tooltiptag.appendChild(document.createElement("br"));
@@ -75,6 +81,12 @@ function extract_info(cell, obj, tag, colorPolicies){
       if(!Array.isArray(e[k])){
         for (let key in e[k]) {
         const pair_in_list = document.createElement("p");
+        if(!Array.isArray(e[k][key]) && typeof e[k][key] === "string"){
+          names.push(`${k}:${key}:  ${e[k][key]}`); 
+        pair_in_list.appendChild(document.createTextNode(`${k}:${key}:  ${e[k][key]}`));
+        
+        }
+        else{
         names.push(`${k}:${key}:  ${e[k][key][0]}`); 
         pair_in_list.appendChild(document.createTextNode(`${k}:${key}:  ${e[k][key][0]}`));
         if(e[k][key][2] && e[k][key][2]["conflict"]){
@@ -82,7 +94,7 @@ function extract_info(cell, obj, tag, colorPolicies){
           tooltiptag.style.color = colorPolicies[e[k][key][2]["conflict"]];
           hasConfict = true;
           
-        }
+        }}
         pair.appendChild(pair_in_list);
       }
       }else{
@@ -105,7 +117,18 @@ function extract_info(cell, obj, tag, colorPolicies){
   }
 
   function link_to_person(data){
-    window.location.href += `?id=${data["@id"][0]}`;
+    if(data["@id"]){
+      if(!Array.isArray(data["@id"])){
+        data["@id"] = [data["@id"]];
+      }
+    window.location.href += `?@id=${data["@id"][0]}`;
+  }else{
+    if(!Array.isArray(data["familyName"])){
+        data["familyName"] = [data["familyName"]];
+      }
+    window.location.href += `?familyName=${data["familyName"][0]}`;
+  }
+
   }
 
   export {extract_info};
diff --git a/public/curation/github_artifacts.js b/public/curation/github_artifacts.js
new file mode 100644
index 0000000..a5b26e2
--- /dev/null
+++ b/public/curation/github_artifacts.js
@@ -0,0 +1,70 @@
+import { BlobReader, TextWriter, ZipReader } from "https://cdn.jsdelivr.net/npm/@zip.js/zip.js@2.7.72/+esm";
+import { Octokit } from "https://esm.sh/@octokit/rest";
+import { displayJSON } from "./curation.js";
+
+const showDebugInformation = false;
+
+async function githubArtifacts() {
+    const token = localStorage.getItem("git-api-token");
+    if (!token) {
+        alert("Please set up the GitLab connection first");
+        window.location = "../";
+        return;
+    }
+    const owner = localStorage.getItem("owner");
+    const repo = localStorage.getItem("repo");
+    const artifactId = localStorage.getItem("artifactId");
+    
+    const octokit = new Octokit({
+  auth: token
+})
+
+//https://softwarepub.github.io/software-card/callback/?type=github&owner=softwarepub&repo=software-card-showcase&artifactId=7291062769
+//https://github.com/softwarepub/software-card-showcase/actions/runs/26636754684/artifacts/7290497137
+    // --- Job artifacts ---
+const artifact =  await octokit.request(`GET /repos/${owner}/${repo}/actions/artifacts/${artifactId}/zip`, {
+  owner: `${owner}`,
+  repo: `${repo}`,
+  artifact_id: `${artifactId}`,
+  archive_format: 'zip',
+  headers: {
+    'X-GitHub-Api-Version': '2026-03-10'
+  }
+})
+if (artifact.status !== 200) {
+    alert("Fetching artifacts failed");
+    }
+
+
+const response = await fetch(artifact.url);
+
+
+    // this is a zip file :-(
+    const artifactsData = await response.blob();
+    
+
+    const zipFileReader = new BlobReader(artifactsData);
+    const zipReader = new ZipReader(zipFileReader);
+    const fileEntries = await zipReader.getEntries();
+    
+
+    do {
+        var fileEntry = fileEntries.shift();
+        if (showDebugInformation) {
+            console.log(fileEntry);
+        }
+    } while (fileEntry["filename"] != "hermes.json");
+
+    const reportWriter = new TextWriter();
+    const reportText = await fileEntry.getData(reportWriter);
+    await zipReader.close();
+
+    console.log(reportText);
+    displayJSON(JSON.parse(reportText)["curate"]);
+
+    //const reportContentsTextArea = document.getElementById("report-contents");
+    //reportContentsTextArea.value = reportText;
+
+};
+
+export {githubArtifacts};
\ No newline at end of file
diff --git a/public/curation/gitlab_artifacts.js b/public/curation/gitlab_artifacts.js
new file mode 100644
index 0000000..d0a6565
--- /dev/null
+++ b/public/curation/gitlab_artifacts.js
@@ -0,0 +1,57 @@
+import { BlobReader, TextWriter, ZipReader } from "https://cdn.jsdelivr.net/npm/@zip.js/zip.js@2.7.72/+esm";
+import { displayJSON } from "./curation.js";
+
+const showDebugInformation = false;
+
+async function gitlabArtifacts () {
+    const token = localStorage.getItem("git-api-token");
+    if (!token) {
+        alert("Please set up the GitLab connection first!");
+        window.location = "../";
+        return;
+    }
+
+    const url = localStorage.getItem("url");
+    const repo = localStorage.getItem("repo");
+    const artifactId = localStorage.getItem("artifactId");
+
+    //https://softwarepub.github.io/software-card/callback?type=gitlab&url=https://codebase.helmholtz.cloud&repo=21313&artifactId=3159194
+
+    // --- Job artifacts ---
+
+    const jobArtifactsResponse = await fetch(
+        `https://codebase.helmholtz.cloud/api/v4/projects/${repo}/jobs/${artifactId}/artifacts`,
+        { headers: { "Content-Type": "application/json", "PRIVATE-TOKEN": token } }
+    );
+
+    if (!jobArtifactsResponse.ok) {
+        alert("Fetching artifacts failed");
+        return;
+    }
+    console.log(jobArtifactsResponse);
+
+    // this is a zip file :-(
+    const artifactsData = await jobArtifactsResponse.blob();
+
+    const zipFileReader = new BlobReader(artifactsData);
+    const zipReader = new ZipReader(zipFileReader);
+    const fileEntries = await zipReader.getEntries();
+
+    do {
+        var fileEntry = fileEntries.shift();
+        if (showDebugInformation) {
+            console.log(fileEntry);
+        }
+    } while (fileEntry["filename"] != ".hermes/curate/hermes.json");
+
+    const reportWriter = new TextWriter();
+    const reportText = await fileEntry.getData(reportWriter);
+    await zipReader.close();
+
+
+    console.log(reportText);
+    displayJSON(JSON.parse(reportText));
+
+}
+
+  export {gitlabArtifacts};
\ No newline at end of file
diff --git a/public/curation/index.html b/public/curation/index.html
index 1e9051e..b6c47ef 100644
--- a/public/curation/index.html
+++ b/public/curation/index.html
@@ -13,7 +13,7 @@
 </head>
 <body>
     <div id="header">
-    <h1><a href="../">Software CaRD</a>
+    <h1><a href="./">Software CaRD</a>
     </h1>
     <canvas onclick="location.href = '../reporting/';" id="radar" width="80" height="80">
     </canvas>
diff --git a/public/curation/safe_comments.js b/public/curation/safe_comments.js
index d386673..76d4f45 100644
--- a/public/curation/safe_comments.js
+++ b/public/curation/safe_comments.js
@@ -1,5 +1,6 @@
 import { addComment } from '../modules/storage.js'
 
 export async function addToBatch(value, data, comment){
+    //TODO: Value is first of string right now
     addComment(value, data, comment);
 }
diff --git a/public/curation/script.js b/public/curation/script.js
index 41f9d41..4c878d3 100644
--- a/public/curation/script.js
+++ b/public/curation/script.js
@@ -1,6 +1,7 @@
 import {drawHexagon, drawRadar } from "../radar.js";
 import { displayJSON } from "./curation.js";
-
+import { githubArtifacts } from "./github_artifacts.js";
+import { gitlabArtifacts } from "./gitlab_artifacts.js";
 
 //Draw radar plot
 const canvas = document.getElementById('radar');
@@ -16,4 +17,14 @@ drawRadar(ctx, canvas.offsetWidth/2,canvas.offsetHeight/2, [15,15,10,15,15,12],
 drawRadar(ctx, canvas.offsetWidth/2,canvas.offsetHeight/2, [20,20,9,10,20,15], "blue", "rgba(94, 148, 215, 0.34)");
 
 //View for Curation
-displayJSON("../.hermes/process/transport.json");
+const type = localStorage.getItem("instance-type");
+if(type=="github"){
+    githubArtifacts();
+}else if(type=="gitlab"){
+    gitlabArtifacts();
+}else{
+    fetch("../.hermes/process/transport.json")
+  .then(response => response.json())
+  .then(data => {
+    displayJSON(data);})
+}
\ No newline at end of file
diff --git a/public/curation/send_report.js b/public/curation/send_report.js
index 1ed4172..45013bc 100644
--- a/public/curation/send_report.js
+++ b/public/curation/send_report.js
@@ -1,4 +1,4 @@
-import { retrieveComment, retrievePipeline } from "../modules/storage.js";
+import { retrieveComment } from "../modules/storage.js";
 import * as User from "/modules/user.js"
 import { Octokit } from "https://esm.sh/@octokit/rest";
 
@@ -7,6 +7,32 @@ const report = document.getElementById("sendReport");
 report.addEventListener("click", sendReport);
 async function sendReport(){
   var message = "In [Software-CaRD](https://software-metadata.pub/software-card/) the following notes were added.\n";
+    if(localStorage.hasOwnProperty("instance-type")){
+        const repo = localStorage.getItem("repo", repo);
+        const artifactId = localStorage.getItem("artifactId", artifactId);
+
+        if (localStorage.getItem("instance-type") == "github"){
+          //callback/?type=github&owner=softwarepub&repo=software-card-showcase&artifactId=7291062769
+          const owner = localStorage.getItem("owner", owner);
+          message = `In [Software-CaRD](https://software-metadata.pub/software-card/callback/?type=github&owner=${owner}&repo=${repo}&artifactId=${artifactId}) the following notes were added.\n";`
+        }else if (localStorage.getItem("instance-type") == "gitlab"){
+          //callback?type=gitlab&url=https://codebase.helmholtz.cloud&repo=21313&artifactId=3159194
+          const url = localStorage.getItem("url", url);
+          message = `In [Software-CaRD](https://software-metadata.pub/software-card/callback/?type=gitlab&url=${url}&repo=${repo}&artifactId=${artifactId}) the following notes were added.\n";`
+        }else{
+          console.log("Something unexpected happend")
+          window.location = "./";
+        }
+
+
+    }else{
+      console.log("No repository is connected.");
+      alert("No Repository is connected. Please use the issue link with a callback");
+      window.location = "./";
+
+    }
+
+  
   var comment = await retrieveComment();
   while (comment !== null) {
 
@@ -15,7 +41,7 @@ async function sendReport(){
 
 ${comment.comment}
 <table><tr>
-<td>${comment.value}</td><td>${JSON.stringify(comment.data[0])}</td>
+<td>${comment.value}</td><td>${JSON.stringify(comment.data)}</td>
 </tr></table>
 
 `;
@@ -26,11 +52,11 @@ ${comment.comment}
   console.log(message);
 
 
-  const token = localStorage.getItem("gitlab-api-token");
+  const token = localStorage.getItem("git-api-token");
   const username = User.getUsername();
   const platform = User.getGitPlatform(); 
   console.log(platform);
-  var [projectId, pipelineId, jobId] = await retrievePipeline();
+  const projectId = localStorage.getItem("repo");
   if(platform.host == "github"){
     issueGithub(token, username, message);
   }else{
@@ -56,20 +82,22 @@ const response = await fetch(
     );
 
     const data = await response.json();
+    alert("Send to GitLab");
 
 }
 async function issueGithub(token, username, message){
+    const owner = localStorage.getItem("owner");
+    const repo = localStorage.getItem("repo");
     //TODO Test for Github
 const octokit = new Octokit({
     auth: token
   })
 
 try{
-        await octokit.request('POST /repos/SKernchen/SoftwareCaRD-Test/issues', {
-        owner: `${username}`,
-        repo: 'SoftwareCaRD-test',
+        await octokit.request(`POST /repos/${owner}/${repo}/issues`, {
+        owner: `${owner}`,
+        repo: `${repo}`,
         title: `Curation Report`,
-        labels: ['curation'],
         body: message,
         headers: {
           'X-GitHub-Api-Version': '2022-11-28'
diff --git a/public/dashboard/index.html b/public/dashboard/index.html
deleted file mode 100644
index 3c06ac6..0000000
--- a/public/dashboard/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-  <link rel="stylesheet" href="../style.css">
-  <link rel="icon" href="data:,">
-  <link rel="icon" href="../pictures/Logo.png" type="image/icon type">
-
-  <script type="module" src="./main.js"></script>
-
-  <title>Dashboard | Software CaRD</title>
-</head>
-
-<body>
-  <h1><a href="../">Software CaRD</a></h1>
-  <h3>Dashboard</h3>
-  <p>
-    This could be a dashboard in the future.
-    For now, it only tries to downloads the artifacts from the latest registered pipeline job.
-  </p>
-  <p id="pipeline-info"></p>
-  <p id="report-conforms"></p>
-  <p>Report contents:</p>
-  <textarea id="report-contents" rows="10"></textarea>
-</body>
-
-</html>
diff --git a/public/dashboard/main.js b/public/dashboard/main.js
deleted file mode 100644
index a5a4d59..0000000
--- a/public/dashboard/main.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { retrievePipeline } from "../modules/storage.js";
-import { BlobReader, TextWriter, ZipReader } from "https://cdn.jsdelivr.net/npm/@zip.js/zip.js@2.7.72/+esm";
-
-const showDebugInformation = false;
-
-window.onload = async function () {
-    const token = localStorage.getItem("gitlab-api-token");
-    if (!token) {
-        alert("Please set up the GitLab connection first!");
-        window.location = "../";
-        return;
-    }
-
-    var [projectId, pipelineId, jobId] = await retrievePipeline();
-
-    // --- Pipeline info ---
-
-    const pipelineResponse = await fetch(
-        `https://codebase.helmholtz.cloud/api/v4/projects/${projectId}/pipelines/${pipelineId}`,
-        { headers: { "Content-Type": "application/json", "PRIVATE-TOKEN": token } }
-    );
-
-    if (!pipelineResponse.ok) {
-        alert("Fetching pipeline failed");
-        return;
-    }
-
-    const pipelineData = await pipelineResponse.json();
-    const pipelineStatus = pipelineData["status"];
-    const pipelineUrl = pipelineData["web_url"];
-
-    const pipelineInfoParagraph = document.getElementById("pipeline-info");
-    pipelineInfoParagraph.innerHTML = `Pipeline <a href="${pipelineUrl}">${pipelineId}</a> status: ${pipelineStatus}.`
-
-    // --- Job artifacts ---
-
-    const jobArtifactsResponse = await fetch(
-        `https://codebase.helmholtz.cloud/api/v4/projects/${projectId}/jobs/${jobId}/artifacts`,
-        { headers: { "Content-Type": "application/json", "PRIVATE-TOKEN": token } }
-    );
-
-    if (!jobArtifactsResponse.ok) {
-        alert("Fetching artifacts failed");
-        return;
-    }
-
-    // this is a zip file :-(
-    const artifactsData = await jobArtifactsResponse.blob();
-
-    const zipFileReader = new BlobReader(artifactsData);
-    const zipReader = new ZipReader(zipFileReader);
-    const fileEntries = await zipReader.getEntries();
-
-    do {
-        var fileEntry = fileEntries.shift();
-        if (showDebugInformation) {
-            console.log(fileEntry);
-        }
-    } while (fileEntry["filename"] != "public/validation-report.ttl");
-
-    const reportWriter = new TextWriter();
-    const reportText = await fileEntry.getData(reportWriter);
-    await zipReader.close();
-
-    console.log(reportText);
-
-    const reportContentsTextArea = document.getElementById("report-contents");
-    reportContentsTextArea.value = reportText;
-
-    // --- "Parse" the RDF ---
-
-    // I couldn't get rdfjs to work from a CDN... So let's just do this:
-    const reportConforms = reportText.includes("sh:conforms true");
-
-    const reportConformsParagraph = document.getElementById("report-conforms");
-    reportConformsParagraph.innerText = `Report conforms: ${reportConforms}.`;
-};
diff --git a/public/git-login/index.html b/public/git-login/index.html
index 4b6ac61..fc5d722 100644
--- a/public/git-login/index.html
+++ b/public/git-login/index.html
@@ -15,7 +15,9 @@
 </head>
 
 <body>
-  <h1><a href="../">Software CaRD</a></h1>
+  <div id="header">
+    <h1><a href="../curation/">Software CaRD</a></h1>
+    </div>
   <h3>GitLab Account Setup</h3>
   <div class="section" id="platform-section">
     <label for="platform-select">Choose a platform:</label>
diff --git a/public/git-login/main.js b/public/git-login/main.js
index efbb3ac..3dd58e0 100644
--- a/public/git-login/main.js
+++ b/public/git-login/main.js
@@ -19,7 +19,7 @@ window.onload = async function () {
         const token = tokenInput.value.trim();
         if (token) {
             if (token === savedToken) {
-                window.location = "../";
+                window.location = "../curation/";
                 return;
             }
             const platform_name = User.getGitPlatformName();
@@ -46,18 +46,18 @@ window.onload = async function () {
             const userData = await response.json();
 
             if (platform.host == "gitlab") {
-                localStorage.setItem("gitlab-username", userData["username"]);
-                localStorage.setItem("gitlab-name", userData["name"]);
-                localStorage.setItem("gitlab-api-token", token);
+                localStorage.setItem("git-username", userData["username"]);
+                localStorage.setItem("git-name", userData["name"]);
+                localStorage.setItem("git-api-token", token);
                 User.setUser(platform_name, token, userData["username"], userData["name"]);
             } else {
-                localStorage.setItem("gitlab-username", userData["login"]);
-                localStorage.setItem("gitlab-name", userData["name"]);
-                localStorage.setItem("gitlab-api-token", token);
+                localStorage.setItem("git-username", userData["login"]);
+                localStorage.setItem("git-name", userData["name"]);
+                localStorage.setItem("git-api-token", token);
                 User.setUser(platform_name, token, userData["login"], userData["name"]);
             }
             
-            window.location = "../";
+            window.location = "../curation/";
             return;
         }
     };
diff --git a/public/index.html b/public/index.html
index c4da6c5..f2c9460 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,17 +14,12 @@
 </head>
 
 <body>
-  <h1><a href="../">Software CaRD</a></h1>
+  <h1><a href="./">Software CaRD</a></h1>
   <h3>Welcome<span id="welcome-username"></span></h3>
   <p>
     You can do the following:
   <ol>
     <li>Set up the <a href="./git-login/">connection to your GitLab account</a>.</li>
-    <li>Load an <a href="./callback?gitlab_project_id=17500&gitlab_pipeline_id=570319&gitlab_job_id=2350529">
-        example CI pipeline</a>.</li>
-    <li>Load the <a href="./callback?gitlab_project_id=17500&latest=1">
-      newest CI pipeline</a>.</li>
-    <li>See your <a href="./dashboard/">dashboard</a>.</li>
     <li>See your <a href="./curation/">curation view</a>.</li>
     <li>See your <a href="./reporting/">reporting view</a>.</li>
   </ol>
diff --git a/public/modules/storage.js b/public/modules/storage.js
index 8f28efd..5f8e8a0 100644
--- a/public/modules/storage.js
+++ b/public/modules/storage.js
@@ -35,65 +35,6 @@ function getStoreIndex(store, indexName) {
     });
 }
 
-function addPipelineToQueue(queue, index, gitLabProjectId, gitLabPipelineId, gitLabJobId) {
-    return new Promise((resolve, reject) => {
-        var search = index.get([gitLabPipelineId]);
-
-        search.onsuccess = (event) => {
-            if (!event.target.result) {
-                queue.put({
-                    projectId: gitLabProjectId,
-                    pipelineId: gitLabPipelineId,
-                    jobId: gitLabJobId,
-                    imported: false
-                });
-            }
-            resolve();
-        };
-
-        search.onerror = (event) => { reject("Lookup of pipelineId failed") };
-    });
-}
-
-async function registerPipeline(gitLabProjectId, gitLabPipelineId, gitLabJobId) {
-    try {
-        var database = await getDatabase();
-        var queue = await getDatabaseStore(database, "PipelineQueue");
-        var index = await getStoreIndex(queue, "PipelineIdIndex");
-        addPipelineToQueue(queue, index, gitLabProjectId, gitLabPipelineId, gitLabJobId);
-    } catch (error) {
-        console.error(error);
-    }
-}
-
-function getUnregisteredPipelineFromQueue(queue) {
-    return new Promise((resolve, reject) => {
-        var pipelines = queue.getAll();
-
-        pipelines.onsuccess = (event) => {
-            for (const pipeline of event.target.result) {
-                if (!pipeline.imported) {
-                    resolve([pipeline.projectId, pipeline.pipelineId, pipeline.jobId]);
-                }
-            }
-            resolve(null);
-        };
-
-        pipelines.onerror = (event) => { reject("Search for unimported pipelines failed") };
-    });
-}
-
-async function retrievePipeline() {
-    try {
-        var database = await getDatabase();
-        var queue = await getDatabaseStore(database, "PipelineQueue");
-        return getUnregisteredPipelineFromQueue(queue);
-    } catch (error) {
-        console.error(error);
-    }
-    return new Promise();
-}
-
 function addCommentToQueue(queue, index, value, data, comment) {
     return new Promise((resolve,reject) => {
         queue.put({
@@ -160,7 +101,7 @@ function deleteDatabase(name) {
     });
 }
 
-async function deleteAllPipelines() {
+async function deleteAllComments() {
     try {
         await deleteDatabase("Software CaRD");
     } catch (error) {
@@ -168,4 +109,4 @@ async function deleteAllPipelines() {
     }
 }
 
-export { registerPipeline, retrievePipeline, deleteAllPipelines, addComment, retrieveComment }
+export { deleteAllComments as deleteAllPipelines, addComment, retrieveComment }
diff --git a/public/reporting/index.html b/public/reporting/index.html
index 03db536..13d2431 100644
--- a/public/reporting/index.html
+++ b/public/reporting/index.html
@@ -13,7 +13,7 @@
 </head>
 <body>
     <div id="header">
-    <h1><a href="../">Software CaRD</a></h1>
+    <h1><a href="../curation/">Software CaRD</a></h1>
     </div>
     <canvas id="radar" width="400" height="300">
     </canvas>
diff --git a/public/style.css b/public/style.css
index 9449a16..6ef05a8 100644
--- a/public/style.css
+++ b/public/style.css
@@ -275,10 +275,11 @@ border-color: transparent transparent #555 transparent;
   position: absolute;
   visibility: hidden;
   background-color: #bababa;
+  color: white;
   padding: 5px;
   border-radius: 12px;
-  top: 17px;
-  left: -250px;
+  top: 25px;
+  left: -300%;
   z-index: 1;
 }
 .single-line-comment-popup::after {
@@ -292,6 +293,15 @@ border-width: 5px;
 border-style: solid;
 border-color: transparent transparent #bababa transparent;
 }
+.single-line-comment-popup [type=submit] {
+    top: 100%;
+    border-radius: 12px;
+    background-color:  rgb(23, 124, 207) ;
+    color: white;
+    border-color: white;
+    padding: 4px;
+    margin-top: 5px;
+}
 
 input[type=text]{
   width:500px;