diff --git a/views/index.ejs b/views/index.ejs
index b7595dc..617252e 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -122,43 +122,7 @@
       </div>
     </div>
 
-    <div class="lg:w-72 lg:overflow-y-hidden">
-      <ul class="p-5">
-        <li>
-          <a class="font-bold text-lg mb-4 block" href="/"><i class="fa fa-home mr-2"></i>Home</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
-        </li>
-      </ul>
-    </div>
+    <%- include('partials/_sidebar_menu.ejs') %>
 
   </div>
   </div>
diff --git a/views/me.ejs b/views/me.ejs
index 88c8f4d..91be890 100644
--- a/views/me.ejs
+++ b/views/me.ejs
@@ -122,43 +122,7 @@
       </div>
     </div>
 
-    <div class="lg:w-72 lg:overflow-y-hidden">
-      <ul class="p-5">
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-home mr-2"></i>Home</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
-        </li>
-      </ul>
-    </div>
+    <%- include('partials/_sidebar_menu.ejs') %>
 
   </div>
   </div>
diff --git a/views/partials/_messages.ejs b/views/partials/_messages.ejs
index 31656ad..7845adc 100644
--- a/views/partials/_messages.ejs
+++ b/views/partials/_messages.ejs
@@ -11,7 +11,9 @@
         </h5>
 
         <p>
-          <%- messages[i].body.replace(/\n/g, '<br>') %>
+          <% messages[i].body.split('\n').forEach(line => { %>
+            <%= line %><br>
+          <% }) %>
         </p>
       </div>
       <div class="text-xs text-gray-500 mt-3">Posted on: <%= messages[i].createdAt %>
diff --git a/views/partials/_sidebar_menu.ejs b/views/partials/_sidebar_menu.ejs
new file mode 100644
index 0000000..97528d8
--- /dev/null
+++ b/views/partials/_sidebar_menu.ejs
@@ -0,0 +1,37 @@
+<div class="lg:w-72 lg:overflow-y-hidden">
+  <ul class="p-5">
+    <li>
+      <a href="/" class="font-bold text-lg mb-4 block"><i class="fa fa-home mr-2"></i>Home</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
+    </li>
+    <li>
+      <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
+    </li>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/views/partials/_toot.ejs b/views/partials/_toot.ejs
index a52dec6..b17fb1f 100644
--- a/views/partials/_toot.ejs
+++ b/views/partials/_toot.ejs
@@ -11,7 +11,9 @@
         </h5>
 
         <p>
-          <%= messages[i].body%>
+          <% messages[i].body.split('\n').forEach(line => { %>
+            <%= line %><br>
+          <% }) %>
         </p>
       </div>
       <div class="text-xs text-gray-500 mt-3">Posted on: <%= messages[i].createdAt %>
diff --git a/views/user.ejs b/views/user.ejs
index 0b6c958..2b3ea6a 100644
--- a/views/user.ejs
+++ b/views/user.ejs
@@ -96,14 +96,6 @@
             <img src="/images/avatar_94.png" alt="<%= user.name %>" class="rounded-md overflow-visible">
           </div>
           <div class="flex items-center pt-3 px-2 mx-2">
-            <button class="bg-blue-600 
-                           py-2 
-                           px-5 
-                           rounded-md 
-                           mr-3 
-                           focus:outline-none 
-                           focus:shadow-outline"
-              type="submit">Follow</button>
               <a class="bg-blue-600
                         py-2
                         px-5
@@ -115,7 +107,7 @@
                         inline-flex 
                         items-center 
                         " 
-                  href="/follow/add/<%= user.id %>">Link</a>
+                  href="/follow/add/<%= user.id %>">Follow</a>
             <button
               class="bg-gray-600 border border-b-gray-400 py-2 px-5 rounded-md focus:outline-none focus:shadow-outline shadow-xl"
               type="submit"><i class="fa fa-ellipsis-v"></i></button>
@@ -140,43 +132,7 @@
       </div>
     </div>
 
-    <div class="lg:w-72 lg:overflow-y-hidden">
-      <ul class="p-5">
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-home mr-2"></i>Home</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
-        </li>
-        <li>
-          <a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
-        </li>
-      </ul>
-    </div>
+    <%- include('partials/_sidebar_menu.ejs') %>
 
   </div>
   </div>