diff --git a/app/templates/_post_nort.html b/app/templates/_post_nort.html
deleted file mode 100644
index 46a3483..0000000
--- a/app/templates/_post_nort.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="ui centered card"><!--Start tweet-->
-    <div class="content">
-        <div class="extra content">
-            <div class="left floated author">
-                <img class="ui avatar image" src="{{ post.profilePic }}">
-            </div>
-            
-            <a href="{{post.url}}"><span class="right floated star">
-                <i class="share square outline icon"></i>
-            </span></a>
-        </div>
-        <div class="header" id="author"><a href="user/{{post.op.replace('@','')}}">{{ post.op }}</a></div>
-        <div class="meta">
-            <span class="category" id="time"><i class="clock icon"></i> {{post.date}} </span>
-            {% if post.isPinned %}
-            <span class="category" id="time"><i class="map pin icon"></i> Pinned </span>
-            {%endif%}
-        </div>
-        <div class="description break-word">
-            <p>{{post.content}}</p>
-        </div>
-        <div class="extra content">
-            <form class="ui form" action="{{ url_for('savePost', url=post.url.replace('/', '~')) }}" method="post">
-                <button type="submit" class="ui icon button">
-                    <i class="bookmark outline icon"></i>
-                </button>
-            </form>
-        </div>
-    </div>
-</div> <!--End tweet-->
\ No newline at end of file
diff --git a/app/templates/_post.html b/app/templates/_twitter_post.html
similarity index 63%
rename from app/templates/_post.html
rename to app/templates/_twitter_post.html
index 2615683..9b06a8b 100644
--- a/app/templates/_post.html
+++ b/app/templates/_twitter_post.html
@@ -2,7 +2,12 @@
     <div class="content">
         <div class="extra content">
             <div class="left floated author">
-                <img class="ui avatar image" src="{{ url_for('static',filename='img/avatars/')}}{{range(1, 12) | random}}.png">
+                {% if post.isRT %}
+                    <img class="ui avatar image" src="{{ url_for('static',filename='img/avatars/')}}{{range(1, 12) | random}}.png">
+                {%else%}
+                <img class="ui avatar image" src="{{ post.profilePic }}">
+                {%endif%}
+
             </div>
             
             <a href="{{post.url}}"><span class="right floated star">
@@ -12,7 +17,12 @@
         <div class="header" id="author"><a href="user/{{post.op.replace('@','')}}">{{ post.op }}</a></div>
         <div class="meta">
             <span class="category" id="time"><i class="clock icon"></i> {{post.date}} </span>
-            <span class="category"><i class="retweet icon"></i> {{post.username}} retwitted</span>      
+            {% if post.isPinned %}
+                <span class="category" id="time"><i class="map pin icon"></i> Pinned </span>
+            {%endif%}
+            {% if post.isRT %}
+                <span class="category"><i class="retweet icon"></i> {{post.username}} retwitted</span>
+            {%endif%}
         </div>
         <div class="description break-word">
             <p>{{post.content}}</p>
diff --git a/app/templates/twitter.html b/app/templates/twitter.html
index 7a1a381..36a5c5a 100644
--- a/app/templates/twitter.html
+++ b/app/templates/twitter.html
@@ -14,11 +14,7 @@
     <div class="text container" id="card-container">
         {% if posts %}
             {% for post in posts %}
-                {% if post.isRT %}
-                    {% include '_post.html' %}
-                {% else %}
-                    {% include '_post_nort.html' %}
-                {% endif %}
+                    {% include '_twitter_post.html' %}
             {% endfor %}
         {% else %}
             <div>No posts</div>