diff --git a/app.py b/app.py
index 95f0ad4..0a22c55 100644
--- a/app.py
+++ b/app.py
@@ -258,7 +258,7 @@ class Page(BaseModel):
         return True
     def is_owned_by(self, user):
         return user.id == self.owner.id
-            
+
 
 class PageText(BaseModel):
     content = BlobField()
diff --git a/i18n/salvi.en.json b/i18n/salvi.en.json
index b49cb7a..42a17cf 100644
--- a/i18n/salvi.en.json
+++ b/i18n/salvi.en.json
@@ -13,6 +13,7 @@
         "last-changed": "Last changed", 
         "page-id": "Page ID", 
         "action-edit": "Edit", 
+        "action-view-source": "View source",
         "action-history": "History", 
         "tags": "Tags", 
         "old-revision-notice": "Showing an old revision of the page as of", 
@@ -58,6 +59,8 @@
         "not-logged-in": "Not logged in",
         "owner": "Owner",
         "page-created": "Page created",
-        "write-a-comment": "Write a comment…"
+        "write-a-comment": "Write a comment…",
+        "input-tags": "Tags (comma separated)",
+        "no-tags": "No tags"
     }
 }
\ No newline at end of file
diff --git a/i18n/salvi.it.json b/i18n/salvi.it.json
index a01ce65..c0daee9 100644
--- a/i18n/salvi.it.json
+++ b/i18n/salvi.it.json
@@ -13,6 +13,7 @@
         "last-changed": "Ultima modifica",
         "page-id": "ID pagina",
         "action-edit": "Modifica",
+        "action-view-source": "Visualizza sorgente",
         "action-history": "Cronologia",
         "tags": "Etichette",
         "old-revision-notice": "\u00c8 mostrata una revisione vecchia della pagina, risalente al",
@@ -48,6 +49,8 @@
         "revision-count-per-page": "Media di revisioni per pagina",
         "remember-me-for": "Ricordami per",
         "owner": "Proprietario",
-        "write-a-comment": "Scrivi un commento…"
+        "write-a-comment": "Scrivi un commento…",
+        "input-tags": "Etichette (separate da virgola)",
+        "no-tags": "Nessuna etichetta"
     }
 }
\ No newline at end of file
diff --git a/static/style.css b/static/style.css
index e30a246..6174cff 100644
--- a/static/style.css
+++ b/static/style.css
@@ -33,6 +33,7 @@ body{font-family:sans-serif;background-color:var(--bg-main); color: var(--fg-mai
 .header ul > li{display:inline-block;padding-right:1em}
 
 /* content styles */
+.article-header {text-align: center;}
 #firstHeading {font-family:sans-serif; text-align: center;font-size:3em; font-weight: normal}
 .inner-content{font-family:serif; margin: 1.7em auto; max-width: 1280px; line-height: 1.9; color: var(--fg-main)}
 .inner-content em,.inner-content strong{color: var(--fg-sharp)}
diff --git a/templates/edit.jinja2 b/templates/edit.jinja2
index b574022..3ccbc37 100644
--- a/templates/edit.jinja2
+++ b/templates/edit.jinja2
@@ -57,8 +57,8 @@
     <textarea name="text" class="text-input" {% if pl_readonly %}disabled=""{% endif %}>{{ pl_text }}</textarea>
   </div>
   <div>
-    <label for="tags">Tags (comma separated):</label>
-    <input type="text" name="tags" class="tags-input" placeholder="No tags" value="{{ pl_tags }}">
+    <label for="tags">{{ T('input-tags') }}:</label>
+    <input type="text" name="tags" class="tags-input" placeholder="{{ T('no-tags') }}" value="{{ pl_tags }}" {% if pl_readonly %}disabled=""{% endif %}>
   </div>
   {% if not pl_readonly %}
   <div>
diff --git a/templates/view.jinja2 b/templates/view.jinja2
index 8205317..139a63b 100644
--- a/templates/view.jinja2
+++ b/templates/view.jinja2
@@ -8,16 +8,24 @@
 
 {% block content %}
 <article>
-  <h1 id="firstHeading">{{ p.title }}</h1>
+  <header class="article-header">
+    <h1 id="firstHeading">{{ p.title }}</h1>
 
-  {% if p.calendar %}
-  <p class="calendar-subtitle"><span class="material-icons">calendar_today</span>{{ p.calendar.strftime('%B %-d, %Y') }}</p>
-  {% endif %}
-  
-  <div class="jump-to-actions">
-    <span>{{ T('last-changed') }} {{ rev.human_pub_date() }}</span> ·
-    <a href="#page-actions">{{ T('jump-to-actions') }}</a>
-  </div>
+    {% if p.calendar %}
+    <p class="calendar-subtitle"><span class="material-icons">calendar_today</span>{{ p.calendar.strftime('%B %-d, %Y') }}</p>
+    {% endif %}
+    
+    <ul class="article-actions inline">
+      {% if current_user and current_user.is_authenticated %}
+      {% if p.is_editable() %}
+      <li><span class="material-icons">edit</span><a href="/edit/{{ p.id }}">{{ T('action-edit') }}</a></li>
+      {% else %}
+      <li><span class="material-icons">code</span><a href="/edit/{{ p.id }}">{{ T('action-view-source') }}</a></li>
+      {% endif %}
+      {% endif %}
+      <li><span class="material-icons">history</span><a href="/history/{{ p.id }}">{{ rev.human_pub_date() }}</a></li>
+    </ul>
+  </header>
 
   {% block history_nav %}{% endblock %}