diff --git a/public_html/media/css/post-view.css b/public_html/media/css/post-view.css
index adcb046a..c147308e 100644
--- a/public_html/media/css/post-view.css
+++ b/public_html/media/css/post-view.css
@@ -1,20 +1,18 @@
-#sidebar {
+sidebar {
 	width: 224px;
 	line-height: 1.33em;
 	font-size: 90%;
 }
 
-img,
-embed {
+.post-type-image img,
+.post-type-video video {
 	max-width: 100%;
 }
 
-.post-type-image img {
-	/*background: url('../img/bk-image.png') lemonchiffon;*/
-}
-.post-type-flash iframe {
+.post-type-youtube iframe {
+	width: 800px;
+	height: 600px;
 	border: 0;
-	/*background: url('../img/bk-swf.png') lemonchiffon;*/
 }
 
 #sidebar .relations ul,
diff --git a/src/Views/post/post-file-render.phtml b/src/Views/post/post-file-render.phtml
index a84ba098..660f0d89 100644
--- a/src/Views/post/post-file-render.phtml
+++ b/src/Views/post/post-file-render.phtml
@@ -7,19 +7,11 @@ $post = $this->context->transport->post;
 
 <?php if ($post->getType()->toInteger() == PostType::Image): ?>
 
-	<?php if (!empty($this->context->imageLink)): ?>
-		<a href="<?= $this->context->imageLink ?>">
-	<?php endif ?>
-
 	<img alt="<?= $post->getName() ?>"
 		src="<?= Core::getRouter()->linkTo(
 			['PostController', 'fileView'],
 			['name' => $post->getName()]) ?>"/>
 
-	<?php if (!empty($this->context->imageLink)): ?>
-		</a>
-	<?php endif ?>
-
 <?php elseif ($post->getType()->toInteger() ==  PostType::Flash): ?>
 
 	<object
@@ -39,16 +31,12 @@ $post = $this->context->transport->post;
 
 <?php elseif ($post->getType()->toInteger() == PostType::Youtube): ?>
 
-	<iframe
-		style="width: 800px; height: 600px; border: 0;"
-		src="//www.youtube.com/embed/<?= $post->getFileHash() ?>?wmode=opaque"
-		allowfullscreen>
-
+	<iframe src="//www.youtube.com/embed/<?= $post->getFileHash() ?>?wmode=opaque" allowfullscreen>
 	</iframe>
 
 <?php elseif ($post->getType()->toInteger() == PostType::Video): ?>
 
-	<video style="max-width: 100%" controls>
+	<video controls>
 		<source
 			type="<?= $post->getMimeType() ?>"
 			src="<?= Core::getRouter()->linkTo(
diff --git a/src/Views/static/static-main.phtml b/src/Views/static/static-main.phtml
index dd4d0c65..05e15280 100644
--- a/src/Views/static/static-main.phtml
+++ b/src/Views/static/static-main.phtml
@@ -18,12 +18,19 @@ $this->assets->addStylesheet('static-main.css');
 	<div class="body">
 		<?php
 			$this->context->transport->post = $this->context->featuredPost;
-			$this->context->imageLink = Core::getRouter()->linkTo(
-				['PostController', 'genericView'],
-				['identifier' => $this->context->featuredPost->getId()]);
 		?>
 
+		<?php if ($this->context->featuredPost->getType()->toInteger() == PostType::Image): ?>
+			<a href="<?= Core::getRouter()->linkTo(
+				['PostController', 'genericView'],
+				['identifier' => $this->context->featuredPost->getId()]) ?>">
+		<?php endif ?>
+
 		<?php $this->renderExternal('post-file-render') ?>
+
+		<?php if ($this->context->featuredPost->getType()->toInteger() == PostType::Image): ?>
+			</a>
+		<?php endif ?>
 	</div>
 
 	<div class="footer">