diff --git a/messages b/messages
index 20c782d..8fc2c41 100644
--- a/messages
+++ b/messages
@@ -18,7 +18,7 @@ update = Save
 published = Published
 publisher = Publisher
 edited = Edited
-article-views = Article Views
+views = Article Views
 statistics = Statistics
 stats = statistics
 export = export
diff --git a/src/NoteHub/views/pages.clj b/src/NoteHub/views/pages.clj
index 1f67155..35356f1 100644
--- a/src/NoteHub/views/pages.clj
+++ b/src/NoteHub/views/pages.clj
@@ -141,20 +141,10 @@
   (when-let [stats (:statistics (api/get-note (api/build-key [year month day] title)))]
     (layout (get-message :statistics)
             [:table#stats.helvetica.central-element
-             [:tr
-              [:td (get-message :published)]
-              [:td (:published stats)]]
-             (when (:edited stats)
-               [:tr
-                [:td (get-message :edited)]
-                [:td (:edited stats)]])
-             (when (:publisher stats)
-               [:tr
-                [:td (get-message :publisher)]
-                [:td (:publisher stats)]])
-             [:tr
-              [:td (get-message :article-views)]
-              [:td (:views stats)]]])))
+             (map
+              #(when (% stats)
+                 [:tr [:td (get-message %)] [:td (% stats)]])
+              [:published :edited :publisher :views])])))
 
 ; Resolving of a short url
 (defpage "/:short-url" {:keys [short-url]}