diff --git a/templates/subreddit.html b/templates/subreddit.html
index 7e46a46..fcfce7a 100644
--- a/templates/subreddit.html
+++ b/templates/subreddit.html
@@ -31,7 +31,7 @@
 			<div id="posts">
 			{% for post in posts %}
 			{% if !(post.flags.nsfw && prefs.hide_nsfw == "on") %}
-			<div class="post {% if post.flags.stickied %}stickied{% endif %} {% if prefs.layout == "card" && post.post_type == "image" %} card_post {% endif %}">
+			<div class="post {% if post.flags.stickied %}stickied{% endif %} {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
 				<div class="post_left">
 					<p class="post_score">{{ post.score }}</p>
 					{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
diff --git a/templates/user.html b/templates/user.html
index e4e5f53..f1afd45 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -23,7 +23,7 @@
 
 			{% if post.flags.nsfw && prefs.hide_nsfw == "on" %}
 			{% else if post.title != "Comment" %}
-			<div class="post">
+			<div class="post {% if post.flags.stickied %}stickied{% endif %} {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
 				<div class="post_left">
 					<p class="post_score">{{ post.score }}</p>
 					{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
@@ -51,8 +51,10 @@
 					<!-- POST MEDIA/THUMBNAIL -->
 					{% if prefs.layout == "card" && post.post_type == "image" %}
 						<img class="post_media" src="{{ post.media }}"/>
-					{% else if prefs.layout != "card" %}
-						<img class="post_thumbnail" src="{{ post.thumbnail }}">
+					{% else if post.post_type == "link" %}
+						<a class="post_thumbnail" href="{{ post.media }}"><img src="{{ post.thumbnail }}"><span>{{ post.domain }}</span></a>
+					{% else if post.post_type != "self" %}
+						<a class="post_thumbnail" href="{{ post.permalink }}"><img src="{{ post.thumbnail }}"><span>{{ post.post_type }}</span></a>
 					{% endif %}
 				</div>
 			</div>