diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index 5a1c67f..e186944 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -10,7 +10,7 @@
   <meta name="twitter:title" content="Swagg::Net::Guestbook - <%= title %>">
   <meta name="twitter:description" content="Messages from the World Wide Web">
   <meta name="twitter:creator" content="@swaggboi@eattherich.club">
-  <meta name="twitter:site" content="@swaggboi@eattherich.club">
+  <meta name="twitter:site" content="Swagg::Net::Guestbook">
   <meta content="Messages from the World Wide Web" name="description">
   <title>Swagg::Net::Guestbook - <%= title %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/templates/layouts/single_message.html.ep b/templates/layouts/single_message.html.ep
index f4db412..701d6ef 100644
--- a/templates/layouts/single_message.html.ep
+++ b/templates/layouts/single_message.html.ep
@@ -3,16 +3,18 @@
 <head>
   <meta property="og:locale" content="en_US">
   <meta property="og:type" content="website">
-  <meta property="og:title" content="Swagg::Net::Guestbook - <%= title %>">
+  <meta property="og:title"
+        content="Swagg::Net::Guestbook - Message #<%= @$view_post[4] %>">
   <meta property="og:description" content="<%= @$view_post[2] %>">
   <meta property="og:url" content="<%= $this_url %>">
   <meta property="og:site_name" content="Swagg::Net::Guestbook">
-  <meta name="twitter:title" content="Swagg::Net::Guestbook - <%= title %>">
+  <meta name="twitter:title"
+        content="Swagg::Net::Guestbook - Message #<%= @$view_post[4] %>">
   <meta name="twitter:description" content="<%= @$view_post[2] %>">
   <meta name="twitter:creator" content="@swaggboi@eattherich.club">
-  <meta name="twitter:site" content="@swaggboi@eattherich.club">
+  <meta name="twitter:site" content="Swagg::Net::Guestbook">
   <meta content="<%= @$view_post[2] %>" name="description">
-  <title>Swagg::Net::Guestbook - <%= title %></title>
+  <title>Swagg::Net::Guestbook - Message #<%= @$view_post[4] %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <%= asset 'swagg.css' %>
 </head>
