diff --git a/libs/formLib.php b/libs/formLib.php
index c7b8544..d656c22 100755
--- a/libs/formLib.php
+++ b/libs/formLib.php
@@ -169,7 +169,7 @@
 	 * @param string $value The comment that should be displayed within the comment box.
 	 *                      The default value is no text.
 	 */
-	function CreateCommentBox($label, $id, $value = "")
+	function CreateCommentBox($label, $id, $value)
 	{
 		CreateRowHeader();
 		echo "	<div class=\"col-sm-8\">\n";
@@ -240,6 +240,64 @@
 			CreateQuestion($entry[1], $id, $value);
 		}
 	}
+	/**
+	 * Echos a range of new divisions with switching row styles for all questions that
+	 * the specified questionnaire data contains. Only the questions are created, nothing else.
+	 *
+	 * @param array $questionnaire The questionnaire data that is used to build the form.
+	 *                             Passed by reference.
+	 * @param array $formData The list of all form elements and their values. This should
+	 *                        simply be the $_POST array that was submitted.
+	 *                        Passed by reference.
+	 */
+	function CreateAllCommentElements(&$questionnaire, &$formData)
+	{	
+		foreach($questionnaire as $id => $entry)
+		{
+			$type = $entry[0];
+			if ($type != Q_COMMENT)
+				continue;
+			$value = "";
+			if (isset($formData[$id]))
+				$value = $formData[$id];
+			CreateCommentBox($entry[1], $id, $value);
+		}
+	}
+	/**
+	 * Echos a range of new divisions with switching row styles for all questions that
+	 * the specified questionnaire data contains. Only the questions are created, nothing else.
+	 *
+	 * @param array $questionnaire The questionnaire data that is used to build the form.
+	 *                             Passed by reference.
+	 * @param array $formData The list of all form elements and their values. This should
+	 *                        simply be the $_POST array that was submitted.
+	 *                        Passed by reference.
+	 */
+	function CreateEvaForm(&$questionnaire, &$formData)
+	{	
+		foreach($questionnaire as $id => $entry)
+		{
+			$type = $entry[0];
+			$value = "";
+			if (isset($formData[$id]))
+				$value = $formData[$id];
+			if ($type == Q_HEADLINE)
+				CreateHeadline($entry[1]);
+			if ($type == Q_LEGEND)
+				CreateLegend();
+			else if ($type == Q_TEXTBOX)
+				CreateTextBox($entry[1], $id, $value);
+			else if ($type == Q_QUESTION)
+				CreateQuestion($entry[1], $id, $value);
+			else if ($type == Q_COMMENT)
+				CreateCommentBox($entry[1], $id, $value);
+			else if ($type == Q_DROPDOWN)
+			{
+				$value = $formData;
+				CreateDropDownMenu($entry[1], $id, $value);
+			}
+		}
+	}
 	/**
 	 * Echos a new division with switching row styles that represents a message box.
 	 *
diff --git a/student_questionnaire.php b/student_questionnaire.php
index 862c891..7cf5caf 100755
--- a/student_questionnaire.php
+++ b/student_questionnaire.php
@@ -69,16 +69,17 @@
 		<div class="container">
 			<form action="" method="post">
 				<?php
-					CreateQuestionnaireElement("headline", $questionnaire, $_POST);
-					if ($error)
-						CreateMessageBox(MSG_DANGER, "Achtung:", "Deine Evaluation konnte aufgrund eines internen Fehlers leider nicht erfolgreich bearbeitet werden.<br/>Bitte versuch es später noch einmal oder wende dich an einen der Verantwortlichen.");
-					else
-						CreateKeyMessageBox($keyState);
-					CreateQuestionnaireElement("code", $questionnaire, $_POST);
-					CreateQuestionnaireElement("tutorName", $questionnaire, $patrons);
-					CreateQuestionnaireElement("legend", $questionnaire, $_POST);
-					CreateAllQuestionElements($questionnaire, $_POST);
-					CreateQuestionnaireElement("comment", $questionnaire, $_POST);
+					// CreateQuestionnaireElement("headline", $questionnaire, $_POST);
+					// if ($error)
+					// 	CreateMessageBox(MSG_DANGER, "Achtung:", "Deine Evaluation konnte aufgrund eines internen Fehlers leider nicht erfolgreich bearbeitet werden.<br/>Bitte versuch es später noch einmal oder wende dich an einen der Verantwortlichen.");
+					// else
+					// 	CreateKeyMessageBox($keyState);
+					// CreateQuestionnaireElement("code", $questionnaire, $_POST);
+					// CreateQuestionnaireElement("tutorName", $questionnaire, $patrons);
+					// CreateQuestionnaireElement("legend", $questionnaire, $_POST);
+					// CreateAllQuestionElements($questionnaire, $_POST);
+					// CreateAllCommentElements($questionnaire, $_POST);
+					CreateEvaForm($questionnaire, $_POST);
 				?>
 				<div class="row">
 					<input class="form-control btn-success" type="submit" name="submit" value="Absenden"/>