diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAO.java
index ca6eba6df6be8623af892b5738188acf08ac5804..3137a9fe0be906f35f38e23115190f14b3a0576a 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAO.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAO.java
@@ -8,6 +8,8 @@ public interface ProjectDescriptionDAO {
     void createDescription(ProjectDescription projectDescription);
     void updateDescription(ProjectDescription projectDescription);
     ProjectDescription getDescription(StudentIdentifier projectDescription);
+
+    ProjectDescription getDescription(String id);
     void deleteDescription(StudentIdentifier projectDescription);
     void closeDescription(String projectDescriptionId);
 }
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java
index 3aa876f555ef8447638342f3e187c79def664768..76ed0aa993470cec84a92e398d73b0e75e942cc1 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java
@@ -13,7 +13,7 @@ import java.util.UUID;
 
 public class ProjectDescriptionDAOImpl implements ProjectDescriptionDAO {
 
-    private Logger log = LoggerFactory.getLogger(ProjectDescriptionDAOImpl.class);
+    private final Logger log = LoggerFactory.getLogger(ProjectDescriptionDAOImpl.class);
 
 
     @Override
@@ -61,7 +61,35 @@ public class ProjectDescriptionDAOImpl implements ProjectDescriptionDAO {
         String request = "SELECT * FROM projectdescription WHERE author = ? AND project = ?;";
         VereinfachtesResultSet rs = connection.issueSelectStatement(request, studentIdentifier.getStudentId(),studentIdentifier.getProjectId());
 
-        if (rs.next()) {
+        if (rs != null && rs.next()) {
+
+            // save journal
+            ProjectDescription description = getDescriptionFromResultSet(rs);
+
+            // close connection
+            connection.close();
+
+            return description;
+        } else {
+
+            // close connection
+            connection.close();
+
+            return null;
+        }
+    }
+
+    @Override
+    public ProjectDescription getDescription(String id) {
+        // establish connection
+        MysqlConnect connection = new MysqlConnect();
+        connection.connect();
+
+        // build and execute request
+        String request = "SELECT * FROM projectdescription WHERE id = ?;";
+        VereinfachtesResultSet rs = connection.issueSelectStatement(request, id);
+
+        if (rs != null && rs.next()) {
 
             // save journal
             ProjectDescription description = getDescriptionFromResultSet(rs);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
index 47a89fb45d159b80d9fa548b02895fc355fdf904..79bf05ed35a80df31fdf7f4c1cb93ad5a16c62c0 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
@@ -3,7 +3,9 @@ package unipotsdam.gf.modules.journal.service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
-import unipotsdam.gf.modules.journal.model.*;
+import unipotsdam.gf.modules.journal.model.Journal;
+import unipotsdam.gf.modules.journal.model.JournalFilter;
+import unipotsdam.gf.modules.journal.model.Visibility;
 import unipotsdam.gf.modules.journal.model.dao.JournalDAO;
 import unipotsdam.gf.modules.journal.model.dao.JournalDAOImpl;
 import unipotsdam.gf.modules.journal.util.JournalUtils;
@@ -65,7 +67,7 @@ public class JournalServiceImpl implements JournalService {
     public void saveJournal(String id, String student, String project, String text, String visibility, String category) {
         log.debug(">> save journal(" + id + "," + student + "," + project + "," + text + "," + visibility + "," + category + ")");
 
-        Journal journal = new Journal(id, new StudentIdentifier(student, project), text, JournalUtils.stringToVisibility(visibility), JournalUtils.stringToCategory(category));
+        Journal journal = new Journal(id, new StudentIdentifier(project, student), text, JournalUtils.stringToVisibility(visibility), JournalUtils.stringToCategory(category));
 
         //if id = 0 new Journal else update
         if (id.equals("0")) {
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
index e82c0fdc13c32ca43f6831cc5e061c5fe9d539f5..feb20170ef6d6fcc3a8f0fa53154066e6e3a249d 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
@@ -1,7 +1,8 @@
 package unipotsdam.gf.modules.journal.service;
 
 import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
-import unipotsdam.gf.modules.journal.model.*;
+import unipotsdam.gf.modules.journal.model.Link;
+import unipotsdam.gf.modules.journal.model.ProjectDescription;
 import unipotsdam.gf.modules.journal.model.dao.LinkDAO;
 import unipotsdam.gf.modules.journal.model.dao.LinkDAOImpl;
 import unipotsdam.gf.modules.journal.model.dao.ProjectDescriptionDAO;
@@ -15,7 +16,7 @@ public class ProjectDescriptionImpl implements ProjectDescriptionService {
     LinkDAO linkDAO = new LinkDAOImpl();
 
     @Override
-    public ProjectDescription getProject(StudentIdentifier studentIdentifier) {
+    public ProjectDescription getProjectbyStudent(StudentIdentifier studentIdentifier) {
 
         //if no description exists, create a new
         if(descriptionDAO.getDescription(studentIdentifier)==null){
@@ -28,10 +29,15 @@ public class ProjectDescriptionImpl implements ProjectDescriptionService {
 
     }
 
+    @Override
+    public ProjectDescription getProjectbyId(String id) {
+        return descriptionDAO.getDescription(id);
+    }
+
     @Override
     public void saveProjectText(StudentIdentifier studentIdentifier, String text) {
 
-        ProjectDescription desc = getProject(studentIdentifier);
+        ProjectDescription desc = getProjectbyStudent(studentIdentifier);
         desc.setDescription(text);
         descriptionDAO.updateDescription(desc);
     }
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java
index 27f61533f11190ad25edc721439087ecb9ddf9bb..2d76e6c454b6c745611742a95b734f9a9d7212a6 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java
@@ -10,8 +10,9 @@ import unipotsdam.gf.modules.journal.model.ProjectDescription;
 public interface ProjectDescriptionService {
 
 
-    ProjectDescription getProject(StudentIdentifier studentIdentifier);
+    ProjectDescription getProjectbyStudent(StudentIdentifier studentIdentifier);
 
+    ProjectDescription getProjectbyId(String id);
     void saveProjectText(StudentIdentifier studentIdentifier, String text);
 
     void addLink(String project, String link, String name);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
index 7613b8f3eaee08194c78eb5bd9b2e20ab7e4caea..68059e911c2c6e91921895d1cc26bb9a837bd3ea 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
@@ -2,6 +2,7 @@ package unipotsdam.gf.modules.journal.view;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 import unipotsdam.gf.modules.journal.model.Journal;
 import unipotsdam.gf.modules.journal.model.JournalFilter;
 import unipotsdam.gf.modules.journal.service.JournalService;
@@ -94,7 +95,7 @@ public class JournalView {
         //TODO token
         URI location;
         try {
-            location = new URI("../pages/eportfolio.jsp?token=test");
+            location = new URI("../pages/eportfolio.jsp?token=" + student + "&projectId=" + project);
             log.debug("<<< createJournal: redirect to " + location.toString());
             return Response.temporaryRedirect(location).build();
 
@@ -136,10 +137,11 @@ public class JournalView {
     public Response closeJournal(String journal){
         log.debug(">>> closeJournal: " + journal);
 
+        StudentIdentifier student = journalService.getJournal(journal).getStudentIdentifier();
         journalService.closeJournal(journal);
         //TODO token
         try {
-            URI location = new URI("../pages/eportfolio.jsp?token=0");
+            URI location = new URI("../pages/eportfolio.jsp?token=" + student.getStudentId() + "&projectId=" + student.getProjectId());
             log.debug("<<< closeJournal: redirect to "  +location.toString());
             return Response.temporaryRedirect(location).build();
 
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
index 7d8e53586914172f0aefa0d74307b3bfdfa9db81..9426b28aa01f9775c28935dc300319fcd093d229 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
@@ -22,8 +22,8 @@ import java.net.URISyntaxException;
 @Path("/projectdescription")
 public class ProjectDescriptionView {
 
-    private Logger log = LoggerFactory.getLogger(ProjectDescriptionView.class);
-    private ProjectDescriptionService descriptionService = new ProjectDescriptionImpl();
+    private final Logger log = LoggerFactory.getLogger(ProjectDescriptionView.class);
+    private final ProjectDescriptionService descriptionService = new ProjectDescriptionImpl();
 
     //get Description
     @GET
@@ -32,7 +32,7 @@ public class ProjectDescriptionView {
     public Response getProjectDescription(@PathParam("project") String project, @PathParam("student") String student){
         log.debug(">>> getProjectDescription: " + project + "/" + student);
 
-        ProjectDescription result = descriptionService.getProject(new StudentIdentifier(project,student));
+        ProjectDescription result = descriptionService.getProjectbyStudent(new StudentIdentifier(project, student));
 
         log.debug(">>> getProjectDescription");
         return Response.ok(result).build();
@@ -43,14 +43,14 @@ public class ProjectDescriptionView {
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     @Produces(MediaType.TEXT_PLAIN)
     @Path("/saveText")
-    public Response saveProjectText(@FormParam("student")String student,@FormParam("project")String project,@FormParam("text")String text){
+    public Response saveProjectText(@FormParam("student") String student, @FormParam("project") String project, @FormParam("text") String text) {
         log.debug(">>> saveText: " + text);
 
         descriptionService.saveProjectText(new StudentIdentifier(project,student),text);
 
         //TODO token
         try {
-            URI location = new URI("../pages/eportfolio.jsp?token=0");
+            URI location = new URI("../pages/eportfolio.jsp?token=" + student + "&projectId=" + project);
             log.debug("<<< saveText: redirect to "  +location.toString());
             return Response.temporaryRedirect(location).build();
 
@@ -59,7 +59,8 @@ public class ProjectDescriptionView {
             log.debug("saveText: redirect failed" );
         }
 
-        log.debug("<<< saveText");log.debug(">>> saveText");
+        log.debug("<<< saveText");
+        log.debug(">>> saveText");
 
         return Response.ok().build();
     }
@@ -121,10 +122,11 @@ public class ProjectDescriptionView {
     public Response closeDescription(String desc){
         log.debug(">>> closeDescription: " + desc);
 
+        StudentIdentifier student = descriptionService.getProjectbyId(desc).getStudent();
         descriptionService.closeDescription(desc);
         //TODO token
         try {
-            URI location = new URI("../pages/eportfolio.jsp");
+            URI location = new URI("../pages/eportfolio.jsp?token=" + student.getStudentId() + "&projectId=" + student.getProjectId());
             log.debug("<<< closeDescription: redirect to "  +location.toString());
             return Response.temporaryRedirect(location).build();
 
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js b/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
index 31ba273f1a6e36938617579c1f7e50b924e6c3ae..aa38ac04b24c6f0434bb9b09393cb65464f9e51a 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
@@ -1,17 +1,12 @@
-function getQueryVariable(variable)
-{
-    var query = window.location.search.substring(1);
-    var vars = query.split("&");
-    for (var i=0;i<vars.length;i++) {
-        var pair = vars[i].split("=");
-        if(pair[0] == variable){return pair[1];}
-    }
-    return(false);
-}
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
 
 $(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+
     $('#backLink').on('click', function(){
-        location.href="eportfolio.jsp?token="+getUserTokenFromUrl();
+        location.href = "eportfolio.jsp?token=" + student + "&projectId=" + project;
     });
 
     var journalID = getQueryVariable("journal");
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
index 038ecf65b0a3436cb919a0601efb4ca5685ef9bb..74f8e7fc86330b6426bea297f33b8ff12c32f975 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
@@ -1,18 +1,10 @@
-//TODO Get student and project form context
-
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
 
 $(document).ready(function() {
-    $('#editDescriptionLink').on('click', function () {
-        /*TODO getJournal*/
-        location.href = "editDescription.jsp?project=0&token=" + getUserTokenFromUrl();
-    });
-
-    $('#createJournalLink').on('click', function () {
-        location.href = "createJournal.jsp?token=" + getUserTokenFromUrl();
-    });
 
     $.ajax({
-        url: "../rest/projectdescription/0"
+        url: "../rest/projectdescription/" + project + "/" + student
     }).then(function(data) {
         console.log("desc: " + data);
         $('.journal-description-text').append(data.descriptionHTML);
@@ -25,16 +17,28 @@ $(document).ready(function() {
             $('.journal-description-group').append(data.group[g]+ '<br/>');
 
         }
+
+
         console.log(data);
     });
 
+
     $.ajax({
-        url: "../rest/journal//journals/0/0/ALL"
+        url: "../rest/journal//journals/" + student + "/" + project + "/ALL"
     }).then(function(data) {
         loadJournals(data);
         console.log(data);
     });
 
+    $('#editDescriptionLink').on('click', function () {
+        /*TODO getJournal*/
+        location.href = "editDescription.jsp?project=" + project + "&token=" + student + "&projectId=" + project;
+    });
+
+    $('#createJournalLink').on('click', function () {
+        location.href = "createJournal.jsp?token=" + student + "&projectId=" + project;
+    });
+
 });
 
 $(document).on("click", ".open-CloseJournalDialog", function () {
@@ -55,7 +59,7 @@ function filterJournals() {
     $('.journal').empty();
 
     $.ajax({
-        url: "../rest/journal//journals/0/0/"+filter
+        url: "../rest/journal//journals/" + student + "/" + project / "+filter"
     }).then(function(data) {
         loadJournals(data);
         console.log(data);
@@ -83,9 +87,9 @@ function loadJournals(data) {
             '<div class="journal-edit" align="right">';
 
         //TODO userToken...
-        if (data[journal].studentIdentifier.studentId == "0" && data[journal].open) {
+        if (data[journal].studentIdentifier.studentId == student && data[journal].open) {
             journalString = journalString +
-                '<a class="btn btn-default btn-sm" href="createJournal.jsp?token=' + getUserTokenFromUrl() + '&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' +
+                '<a class="btn btn-default btn-sm" href="createJournal.jsp?token=' + student + '&projectId=' + project + '&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' +
                 '<a class="open-CloseJournalDialog btn btn-default btn-sm" data-toggle="modal" data-id ='
                 + data[journal].id +
                 ' data-target ="#closeJournalModal" > <i class="fa fa-check-square" aria-hidden = "true" ></i> Abschlie&szlig;en</a> '
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js b/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
index 77eeb04452f089e8369c9b75875eaa3ee2fe4b8b..c664f15fcd3b757da953215a19f3ed09f40fe49b 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
@@ -1,21 +1,28 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+
 $(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+
     $('#backLink').on('click', function(){
-        location.href="eportfolio.jsp?token="+getUserTokenFromUrl();
+        location.href = "eportfolio.jsp?token=" + student + "&projectId=" + project;
     });
 
     $.ajax({
-        url: "../rest/projectdescription/0"
-        }).then(function(data) {
-            $('#editor').append(data.descriptionMD);
+        url: "../rest/projectdescription/" + student + "/" + project
+    }).then(function (data) {
+        $('#editor').append(data.descriptionMD);
 
-            //TODO preselet in select tags
-            new InscrybMDE({
-                element: document.getElementById("editor"),
-                spellChecker: false,
-                forceSync: true,
-            });
+        //TODO preselet in select tags
+        new InscrybMDE({
+            element: document.getElementById("editor"),
+            spellChecker: false,
+            forceSync: true,
+        });
 
-            console.log(data);
+        console.log(data);
 
     });
 })
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/utility.js b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
index 33be09a5afb07442f689e89f4ef61a8c09ebc698..c5b8b37d083e2cc80f2260ded050c6c710143ade 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/utility.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
@@ -13,3 +13,14 @@ function getUserTokenFromUrl() {
 
 }
 
+function getQueryVariable(variable) {
+    var query = window.location.search.substring(1);
+    var vars = query.split("&");
+    for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split("=");
+        if (pair[0] == variable) {
+            return pair[1];
+        }
+    }
+    return (false);
+}
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
index 096a96145b854de8778c48de717fa53fd088a838..047334f69717c358580fb58b3fc6eeff0d370094 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
@@ -1,25 +1,15 @@
 <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
 
 <!DOCTYPE html>
 <html>
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Tagebucheintrag erstellen</title>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../assets/css/styles.css">
+
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
-    <script src="../assets/js/utility.js"></script>
-    <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
-    <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
-    <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
-    <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
     <link rel="stylesheet" type="text/css" href="../assets/css/create-journal.css">
-
+    <omniDependencies:omniDependencies/>
 </head>
 
 <body>
@@ -46,8 +36,8 @@
 
                         <form id="journalform" class="form-journal" method="POST" action="../rest/journal/save">
 
-                            <input type="hidden" name="student" value="0">
-                            <input type="hidden" name="project" value="0">
+                            <input type="hidden" id="student" name="student">
+                            <input type="hidden" id="project" name="project">
                             <input type="hidden" id="journalid" name="id">
 
                             <div class="journal-form-container">
diff --git a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
index 2e40b6946e99e121c3db9d10e262949c8f76331d..5a5bd034793617af707358b3a968d004002cfec1 100644
--- a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
@@ -1,24 +1,15 @@
 <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
 
 <!DOCTYPE html>
 <html>
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Tagebucheintrag erstellen</title>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../assets/css/styles.css">
+
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
-    <script src="../assets/js/utility.js"></script>
-    <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
-    <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
-    <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
-    <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
     <link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
+    <omniDependencies:omniDependencies/>
 
 </head>
 
@@ -45,8 +36,8 @@
 
                         <form id="descriptionform" class="form-journal" method="POST" action="../rest/projectdescription/saveText">
 
-                            <input type="hidden" name="student" value="0">
-                            <input type="hidden" name="project" value="0">
+                            <input type="hidden" id="student" name="student">
+                            <input type="hidden" id="project" name="project">
 
                             <div class="description-form-container">
 
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
index e0fe94c19d031b7bcee7de13bf61660ce2ef1c8f..9b6758154d113df5a3f1bf683ea095105129d2eb 100644
--- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
@@ -1,28 +1,19 @@
 <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
 
 <!DOCTYPE html>
 <html>
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>E-Portfolio</title>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../assets/css/styles.css">
-    <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
-    <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
-    <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
-    <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+
     <link rel="stylesheet" href="../assets/css/e-portfolio.css">
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <script src="../assets/js/utility.js"></script>
+    <omniDependencies:omniDependencies/>
 
 </head>
 
 <body>
 <div id="wrapper">
-    <menu:menu></menu:menu>
+    <menu:menu/>
 
     <div class="page-content-wrapper">
         <div class="container-fluid">