diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index b809dbd5..e4ce1818 100644
Binary files a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo and b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index ddf07c44..c85999cc 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-04-19 23:22+0100\n"
-"PO-Revision-Date: 2014-04-19 23:22+0100\n"
+"POT-Creation-Date: 2014-04-21 21:12+0100\n"
+"PO-Revision-Date: 2014-04-21 21:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -83,12 +83,12 @@ msgid "submitted at %s on %s h"
 msgstr "eingereicht am %s um %s Uhr"
 
 #: questtypes/submit/html/submission.tpl:6
-#: questtypes/submit/html/submission.tpl:8
+#: questtypes/submit/html/submission.tpl:8 views/html/quests/quest.tpl:43
 #: views/html/quests/submissions.tpl:33
 msgid "solved"
 msgstr "gelöst"
 
-#: questtypes/submit/html/submission.tpl:9 views/html/quests/quest.tpl:45
+#: questtypes/submit/html/submission.tpl:9 views/html/quests/quest.tpl:46
 #: views/html/quests/submissions.tpl:24
 msgid "unsolved"
 msgstr "ungelöst"
@@ -372,7 +372,7 @@ msgstr ""
 msgid "Wrong text"
 msgstr ""
 
-#: views/html/quests/create.tpl:37 views/html/quests/quest.tpl:53
+#: views/html/quests/create.tpl:37 views/html/quests/quest.tpl:55
 msgid "Task"
 msgstr "Aufgabe"
 
@@ -392,23 +392,32 @@ msgstr "Filter anwenden"
 msgid "Reset filters"
 msgstr "Filter zurücksetzen"
 
-#: views/html/quests/quest.tpl:58
+#: views/html/quests/quest.tpl:44
+#, php-format
+msgid "Quest completed. You have earned %d XPs."
+msgstr "Quest abgeschlossen. Du hast %d XPs erhalten."
+
+#: views/html/quests/quest.tpl:60
 msgid "Task already successfully solved"
 msgstr "Du hast die Aufgabe bereits erfolgreich gelöst"
 
-#: views/html/quests/quest.tpl:61
+#: views/html/quests/quest.tpl:63
 msgid "Show answer"
 msgstr "Lösung anzeigen"
 
-#: views/html/quests/quest.tpl:62
+#: views/html/quests/quest.tpl:64
 msgid "Skip task"
 msgstr "Aufgabe überspringen"
 
-#: views/html/quests/quest.tpl:67
+#: views/html/quests/quest.tpl:69
 msgid "continue"
 msgstr "fortfahren"
 
-#: views/html/quests/quest.tpl:79 views/html/quests/quest.tpl:92
+#: views/html/quests/quest.tpl:76
+msgid "Continuation"
+msgstr "Fortsetzung"
+
+#: views/html/quests/quest.tpl:82 views/html/quests/quest.tpl:95
 msgid "Quest"
 msgstr "Quest"
 
diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index 4d3ce2b9..285aa706 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -39,7 +39,7 @@
 <?php endforeach ?>
 <?php endif ?>
 
-<?php if(isset($quests) && !is_null($quests)) : ?>
+<?php if(isset($quests) && !is_null($quests) && count($quests) > 0) : ?>
 <h3><?=_('Quests')?></h3>
 <ul class="qglist">
 	<?php foreach($quests as &$quest) : ?>
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index f851166a..5256b4f7 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -10,9 +10,6 @@
 <?php if(count($questtexts) > 0) : ?>
 <section>
 	<h1 id="questtext"><?=$questtexttype['type']?></h1>
-	
-	
-	
 	<div id="qtextbox">
 		<?php $mediaShown = false; ?>
 		<?php foreach($questtexts as &$questtext) : ?>
@@ -40,10 +37,15 @@
 </section>
 <?php endif ?>
 
-<?php if(!is_null($queststatus) && $queststatus == 'unsolved') : ?>
+<?php if(!is_null($queststatus)) : ?>
 <section>
+	<?php if($queststatus == 'solved') : ?>
+	<h1><?=_('solved')?></h1>
+	<p><?=sprintf(_('Quest completed. You have earned %d XPs.'), $quest['xps'])?></p>
+	<?php elseif($queststatus == 'unsolved') : ?>
 	<h1><?=_('unsolved')?></h1>
 	<p><?=\hhu\z\Utils::t($quest['wrong_text'])?></p>
+	<?php endif ?>
 </section>
 <?php endif ?>
 
@@ -71,6 +73,7 @@
 
 <?php if(!is_null($nextquests) || !is_null($nextquestgroup)) : ?>
 <section>
+	<h1><?=_('Continuation')?></h1>
 	<?php if(count($nextquests) > 0) : ?>
 	<ul>
 		<?php foreach($nextquests as &$nextquest) : ?>