diff --git a/src/Views/index-index.phtml b/src/Views/index-index.phtml
index 205af2bf..6424533e 100644
--- a/src/Views/index-index.phtml
+++ b/src/Views/index-index.phtml
@@ -7,9 +7,9 @@
 
 <?php if (!empty($this->context->featuredPost)): ?>
 	<div class="body">
-		<a href="<?php echo \Chibi\UrlHelper::route('post', 'view', ['id' => $this->context->featuredPost->id]) ?>">
-			<img title="Featured image" src="<?php echo \Chibi\UrlHelper::route('post', 'retrieve', ['name' => $this->context->featuredPost->name]) ?>" alt="<?php echo $this->context->featuredPost->name ?>"/>
-		</a>
+		<?php $this->context->imageLink = \Chibi\UrlHelper::route('post', 'view', ['id' => $this->context->featuredPost->id]) ?>
+		<?php $this->context->transport->post = $this->context->featuredPost ?>
+		<?php echo $this->renderFile('post-file-render') ?>
 	</div>
 
 	<div class="footer">
diff --git a/src/Views/post-file-render.phtml b/src/Views/post-file-render.phtml
new file mode 100644
index 00000000..5292907a
--- /dev/null
+++ b/src/Views/post-file-render.phtml
@@ -0,0 +1,23 @@
+<?php $post = $this->context->transport->post ?>
+
+<?php if ($post->type == PostType::Image): ?>
+
+	<?php if (!empty($this->context->imageLink)): ?>
+		<a href="<?php echo $this->context->imageLink ?>">
+	<?php endif ?>
+
+	<img src="<?php echo \Chibi\UrlHelper::route('post', 'retrieve', ['name' => $post->name]) ?>" alt="<?php echo $post->name ?>"/>
+
+	<?php if (!empty($this->context->imageLink)): ?>
+		</a>
+	<?php endif ?>
+
+<?php elseif ($post->type ==  PostType::Flash): ?>
+
+	<embed width="<?php echo $post->image_width ?>" height="<?php echo $post->image_height  ?>" type="application/x-shockwave-flash" src="<?php echo \Chibi\UrlHelper::route('post', 'retrieve', ['name' => $post->name]) ?>"/>
+
+<?php elseif ($post->type == PostType::Youtube): ?>
+
+	<iframe width="800" height="600" src="//www.youtube.com/embed/<?php echo $post->orig_name ?>" frameborder="0" allowfullscreen></iframe>
+
+<?php endif ?>
diff --git a/src/Views/post-view.phtml b/src/Views/post-view.phtml
index 26c5e538..16705108 100644
--- a/src/Views/post-view.phtml
+++ b/src/Views/post-view.phtml
@@ -276,17 +276,7 @@
 
 <div id="inner-content">
 	<div class="post-wrapper post-type-<?php echo strtolower(PostType::toString($this->context->transport->post->type)) ?>">
-		<?php switch ($this->context->transport->post->type):
-			case PostType::Image: ?>
-				<img src="<?php echo \Chibi\UrlHelper::route('post', 'retrieve', ['name' => $this->context->transport->post->name]) ?>" alt="<?php echo $this->context->transport->post->name ?>"/>
-				<?php break ?>
-			<?php case PostType::Flash: ?>
-				<embed width="<?php echo $this->context->transport->post->image_width ?>" height="<?php echo $this->context->transport->post->image_height  ?>" type="application/x-shockwave-flash" src="<?php echo \Chibi\UrlHelper::route('post', 'retrieve', ['name' => $this->context->transport->post->name]) ?>"/>
-				<?php break ?>
-			<?php case PostType::Youtube: ?>
-				<iframe width="800" height="600" src="//www.youtube.com/embed/<?php echo $this->context->transport->post->orig_name ?>" frameborder="0" allowfullscreen></iframe>
-				<?php break ?>
-		<?php endswitch ?>
+		<?php echo $this->renderFile('post-file-render') ?>
 	</div>
 
 	<?php if ($canEditAnything): ?>