diff -r 7ef369744fd1 -r 67df332e3146 src/main/webapp/WEB-INF/jsp/issue-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Thu Oct 15 18:36:05 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Thu Oct 15 20:02:30 2020 +0200
@@ -31,7 +31,8 @@
 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.IssueEditView" scope="request"/>
 <c:set var="issue" scope="page" value="${viewmodel.issue}" />
 
-<form action="./projects/issues/commit" method="post">
+<%-- TODO: change to ./issues/commit --%>
+<form action="./projects/commit-issue" method="post">
     <table class="formtable fullwidth">
         <colgroup>
             <col>
@@ -152,15 +153,8 @@
         <tr>
             <td colspan="2">
                 <input type="hidden" name="id" value="${issue.id}"/>
-                <c:choose>
-                    <c:when test="${not empty issue.project}">
-                        <c:set var="cancelUrl">./projects/view?pid=${issue.project.id}</c:set>
-                    </c:when>
-                    <c:otherwise>
-                        <c:set var="cancelUrl">./projects/</c:set>
-                    </c:otherwise>
-                </c:choose>
-                <a href="${cancelUrl}" class="button">
+                <%-- TODO: fix #14 --%>
+                <a href="./projects/${issue.project.id}/versions/" class="button">
                     <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/>
                 </a>
                 <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button>
@@ -172,7 +166,7 @@
 <hr class="comments-separator"/>
 <h2><fmt:message key="issue.comments"/></h2>
 <c:if test="${viewmodel.issue.id ge 0}">
-<form id="comment-form" action="./projects/issues/comment" method="post">
+<form id="comment-form" action="./projects/commit-issue-comment" method="post">
     <table class="formtable fullwidth">
         <tbody>
             <tr>