diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 34c41ef4..d9887837 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -114,28 +114,24 @@
 		</li>
 		<?php else : ?>
 		<li>
-			<p>
-				<?php if(!empty($nextquest['entry_text'])) : ?>
-				<i><?=$nextquest['entry_text']?></i>
-				<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
-				<a class="cta orange" href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=_('Choose')?></a>
-				<?php endif ?>
-				<?php else : ?>
-				<?=_('Quest')?>: <a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a>
-				<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
-				<a class="cta orange" href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=_('Let’s go')?></a>
-				<?php endif ?>
-				<?php endif ?>
-			</p>
+			<?php if(!empty($nextquest['entry_text'])) : ?>
+			<i><?=$nextquest['entry_text']?></i>
+			<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
+			<p><a class="cta orange" href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=_('Choose')?></a></p>
+			<?php endif ?>
+			<?php else : ?>
+			<p><?=_('Quest')?>: <a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a></p>
+			<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
+			<p><a class="cta orange" href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=_('Let’s go')?></a></p>
+			<?php endif ?>
+			<?php endif ?>
 		</li>
 		<?php endif ?>
 		<?php endforeach ?>
 	</ul>
 	<?php elseif(!is_null($nextquestgroup)) : ?>
-	<p>
-		<?=$nextquestgroup['hierarchy']['title_singular']?> <?=$nextquestgroup['hierarchy']['questgroup_pos']?>: <a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$nextquestgroup['url']))?>"><?=$nextquestgroup['title']?></a>
-		<a class="cta orange" href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$nextquestgroup['url']))?>"><?=_('Let’s go')?></a>
-	</p>
+	<p><?=$nextquestgroup['hierarchy']['title_singular']?> <?=$nextquestgroup['hierarchy']['questgroup_pos']?>: <a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$nextquestgroup['url']))?>"><?=$nextquestgroup['title']?></a></p>
+	<p><a class="cta orange" href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$nextquestgroup['url']))?>"><?=_('Let’s go')?></a></p>
 	<?php endif ?>
 </section>
 <?php endif ?>