diff --git a/templates/global.html b/templates/global.html
index 03c4eac..0699353 100644
--- a/templates/global.html
+++ b/templates/global.html
@@ -7,8 +7,21 @@
             {% for post in posts if not post.hidden %}
                 <div class="card" style="word-wrap: break-word; margin-bottom: 16px; width: 100%;">
                     <div class="card-header">
-                        <b>{{ post.poster }}</b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
-                        <span style="float: right"><a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a> {% if logged_in == post.poster %} <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>{% endif %}</span>
+                        <b><a href="/profile/{{ post.poster }}">{{ post.poster }}</a></b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
+                        <span style="float: right">
+                            {% if logged_in|lower in post.likes %}
+                                <form style="display: inline;" method="POST" action="/unlike/{{ post._id }}"><button type="submit" class="btn btn-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
+                            {% else %}
+                                <form style="display: inline;" method="POST" action="/like/{{ post._id }}"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
+                            {% endif %}
+                            <a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a>
+                            {% if logged_in|lower == post.poster|lower %}
+                                <a href="/editpost/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-edit"></i></a>
+                            {% endif %}
+                            {% if logged_in|lower == post.poster|lower %}
+                                <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>
+                            {% endif %}
+                        </span>
                     </div>
                     <div class="card-body">
                         {{ post.content }}
diff --git a/templates/mentions.html b/templates/mentions.html
index 675e3ee..f11d1f5 100644
--- a/templates/mentions.html
+++ b/templates/mentions.html
@@ -6,7 +6,8 @@
         <div class="row">
             {% for post in posts if not post.hidden %}
                 <div class="card" style="word-wrap: break-word; margin-bottom: 16px; width: 100%;">
-                    <div class="card-header"><b>{{ post.poster }}</b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
+                   <div class="card-header">
+                        <b><a href="/profile/{{ post.poster }}">{{ post.poster }}</a></b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
                         <span style="float: right">
                             {% if logged_in|lower in post.likes %}
                                 <form style="display: inline;" method="POST" action="/unlike/{{ post._id }}"><button type="submit" class="btn btn-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
@@ -14,11 +15,15 @@
                                 <form style="display: inline;" method="POST" action="/like/{{ post._id }}"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
                             {% endif %}
                             <a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a>
-                            {% if logged_in == post.poster %}
+                            {% if logged_in|lower == post.poster|lower %}
+                                <a href="/editpost/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-edit"></i></a>
+                            {% endif %}
+                            {% if logged_in|lower == post.poster|lower %}
                                 <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>
                             {% endif %}
                         </span>
                     </div>
+                    </div>
                     <div class="card-body">
                         {{ post.content }}
                     </div>
diff --git a/templates/reply.html b/templates/reply.html
index f304ea5..e0606e1 100644
--- a/templates/reply.html
+++ b/templates/reply.html
@@ -4,11 +4,27 @@
         <div class="row">
         {% for post in posts %}
             <div class="card" style="word-wrap: brea-word; margin-bottom: 16px; width: 100%;">
-	        <div class="card-header"><b>{{ post.poster }}</b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} <span style="float: right"><a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a> {% if logged_in == post.poster %} <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>{% endif %}</span></div>
-            <div class="card-body">
-		    {{ post.content }}
-		</div>
-	    </div>   
+                <div class="card-header">
+                    <b><a href="/profile/{{ post.poster }}">{{ post.poster }}</a></b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
+                    <span style="float: right">
+                        {% if logged_in|lower in post.likes %}
+                            <form style="display: inline;" method="POST" action="/unlike/{{ post._id }}"><button type="submit" class="btn btn-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
+                        {% else %}
+                            <form style="display: inline;" method="POST" action="/like/{{ post._id }}"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
+                        {% endif %}
+                        <a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a>
+                        {% if logged_in|lower == post.poster|lower %}
+                            <a href="/editpost/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-edit"></i></a>
+                        {% endif %}
+                        {% if logged_in|lower == post.poster|lower %}
+                            <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>
+                        {% endif %}
+                    </span>
+                </div>
+                <div class="card-body">
+                {{ post.content }}
+                </div>
+	        </div>
         {% endfor %}
 
         <div class="card" style="word-wrap: break-word; margin-bottom: 16px; width: 100%;">
diff --git a/templates/timeline.html b/templates/timeline.html
index 23ab502..371e43c 100644
--- a/templates/timeline.html
+++ b/templates/timeline.html
@@ -6,7 +6,8 @@
         <div class="row">
             {% for post in posts if not post.hidden %}
                 <div class="card mx-xs-2 mb-3" style="word-wrap: break-word; width: 100%;">
-                    <div class="card-header"><b>{{ post.poster }}</b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
+                    <div class="card-header">
+                        <b><a href="/profile/{{ post.poster }}">{{ post.poster }}</a></b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
                         <span style="float: right">
                             {% if logged_in|lower in post.likes %}
                                 <form style="display: inline;" method="POST" action="/unlike/{{ post._id }}"><button type="submit" class="btn btn-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
@@ -14,7 +15,10 @@
                                 <form style="display: inline;" method="POST" action="/like/{{ post._id }}"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
                             {% endif %}
                             <a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a>
-                            {% if logged_in == post.poster %}
+                            {% if logged_in|lower == post.poster|lower %}
+                                <a href="/editpost/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-edit"></i></a>
+                            {% endif %}
+                            {% if logged_in|lower == post.poster|lower %}
                                 <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>
                             {% endif %}
                         </span>
diff --git a/templates/view.html b/templates/view.html
index 40dfc66..5349327 100644
--- a/templates/view.html
+++ b/templates/view.html
@@ -4,7 +4,23 @@
         <div class="row">
         {% for post in posts %}
             <div class="card" style="word-wrap: brea-word; margin-bottom: 16px; width: 100%;">
-                <div class="card-header"><b>{{ post.poster }}</b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}<span style="float: right"><a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a> {% if logged_in == post.poster %} <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>{% endif %}</span></div>
+                <div class="card-header">
+                    <b><a href="/profile/{{ post.poster }}">{{ post.poster }}</a></b> at {{ post.timePosted.strftime('%Y-%m-%d %-H:%M') }} {% if post.edited %}<i>(Edited)</i>{% endif %}
+                    <span style="float: right">
+                        {% if logged_in|lower in post.likes %}
+                            <form style="display: inline;" method="POST" action="/unlike/{{ post._id }}"><button type="submit" class="btn btn-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
+                        {% else %}
+                            <form style="display: inline;" method="POST" action="/like/{{ post._id }}"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="fas fa-heart"></i> {{ post.likes|count }}</button></form>
+                        {% endif %}
+                        <a href="/reply/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-reply"></i></a>
+                        {% if logged_in|lower == post.poster|lower %}
+                            <a href="/editpost/{{ post._id }}" class="btn btn-primary btn-sm"><i class="far fa-edit"></i></a>
+                        {% endif %}
+                        {% if logged_in|lower == post.poster|lower %}
+                            <a href="/delete/{{ post._id }}" class="btn btn-danger btn-sm"><i class="far fa-trash-alt"></i></a>
+                        {% endif %}
+                    </span>
+                </div>
                 <div class="card-body">
                     {{ post.content }}
                 </div>