diff --git a/app/templates/_twitter_post.html b/app/templates/_twitter_post.html
index 2795c93..9a5938a 100644
--- a/app/templates/_twitter_post.html
+++ b/app/templates/_twitter_post.html
@@ -24,17 +24,17 @@
         </div>
         <div class="extra content">
             {% if post.attachedImg %}
-                <a href="{{post.attachedImg}}"><img alt="Image attachment" class="ui centered fluid rounded medium image" src="{{post.attachedImg}}"></a>
+                <a href="{{post.attachedImg}}"><img alt="Image attachment" class="ui centered fluid rounded medium image" src="{{post.attachedImg}}">
             {% endif %}
             {% if post.isReply %}
                 <div class="ui card">
                     <div class="content">
-                        <div class="header"><a href="/{{post.replyingUser}}">{{post.replyingUser}}</a></div>
-                        <!--<div class="meta">{{post.replyingUser}}</div>-->
+                        <div class="header"><a href="/post.replyingUser">{{post.replyingUser}}</a></div>
+                        <div class="meta">{{post.replyingUser}}</div>
                         <div class="description break-word">
                         {{post.replyingTweetContent | safe}}
                         {% if post.replyAttachedImg %}
-                            <a href="{{post.attachedImg}}"><img alt="Image attachment" class="ui centered fluid rounded medium image" src="{{post.replyAttachedImg}}"></a>
+                            <a target="_blank" href="{{post.replyAttachedImg}}"><img alt="Image attachment" class="ui centered fluid rounded medium image" src="{{post.replyAttachedImg}}"></a>
                         {% endif %}
                         </div>
                     </div>
diff --git a/app/templates/video.html b/app/templates/video.html
index 1a63160..4c295a6 100644
--- a/app/templates/video.html
+++ b/app/templates/video.html
@@ -37,7 +37,7 @@
         </div>
         <div class="ui horizontal segments">
           <div class="center aligned ui segment">
-            <a target="_blank" href="{{ url_for('channel', id=video.channelId)}}">
+            <a href="{{ url_for('channel', id=video.channelId)}}">
                 {%if video.author.__len__() > 8%}
                     <i class="user icon"></i> {{video.author[0:10]+'...'}}
                 {%else%}