diff --git a/templates/layout.html b/templates/layout.html
index 92e5958..500fce9 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -23,7 +23,7 @@
 }
 {{ highlight_css }}
 </style>
-{% block headers %}{% endblock %}
+{% block header %}{% endblock %}
 </head>
 <body>
 {% if logged_in %}
diff --git a/templates/lists.html b/templates/lists.html
index 106323c..5ed5b6f 100644
--- a/templates/lists.html
+++ b/templates/lists.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% import 'utils.html' as utils %}
 {% block title %}Lists - {{ config.NAME }}{% endblock %}
-{% block headers %}
+{% block header %}
 
 {% endblock %}
 {% block content %}
diff --git a/templates/login.html b/templates/login.html
index 300b866..717dfdc 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% import 'utils.html' as utils %}
 {% block title %}Login - {{ config.NAME }}{% endblock %}
-{% block headers %}
+{% block header %}
 <style>
 #login-container {
 height: 90%;
diff --git a/templates/new.html b/templates/new.html
index 1b9a63c..a41fe4a 100644
--- a/templates/new.html
+++ b/templates/new.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% import 'utils.html' as utils %}
 {% block title %}New - {{ config.NAME }}{% endblock %}
-{% block headers %}
+{% block header %}
 
 {% endblock %}
 {% block content %}
diff --git a/templates/note.html b/templates/note.html
index ce1ad29..930a7b7 100644
--- a/templates/note.html
+++ b/templates/note.html
@@ -2,10 +2,11 @@
 {% import 'utils.html' as utils %}
 {% block title %}{{ config.NAME }}: "{{ note.activity.object.content | html2plaintext | truncate(50) }}"{% endblock %}
 {% block header %}
+<meta name="description" content="{{ note.activity.object.content | html2plaintext | truncate(50) }}">
+
 <meta content="article" property="og:type" />
 <meta content="{{ note.activity.object.url }}" property="og:url" />
-
-<meta content="{{ config.USERNAME }}" property="og:site_name" />                                         
+<meta content="{{ config.USERNAME }} microblog" property="og:site_name" />                                         
 <meta content="{{ config.USERNAME }}" property="og:title" />                                             
 <meta content="{{ note.activity.object.content | html2plaintext | truncate(50) }}" property="og:description" />                                            
 <meta content="{{ me.icon.url }}" property="og:image" />                                                 
