diff --git a/ietf/templates/idrfc/document_charter.html b/ietf/templates/idrfc/document_charter.html
index c949d8644..a23dbaaa7 100644
--- a/ietf/templates/idrfc/document_charter.html
+++ b/ietf/templates/idrfc/document_charter.html
@@ -42,6 +42,13 @@
 
       {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
       - <a href="{% url wg_change_state name=doc.group.acronym %}">Change state</a>
+
+      {% if chartering  %}
+      - <a href="{% url wg_startstop_process name=doc.group.acronym option='abandon' %}">Abandon effort</a>
+      {% else %}
+      - <a href="{% url wg_startstop_process name=doc.group.acronym option='recharter' %}">Recharter</a>
+      {% endif %}
+
       {% endif %}
       </td>
     </tr>
@@ -74,29 +81,17 @@
   </table>
 
   <div class="actions">
-    {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
-
-    {% if chartering  %}
-
-    {% if doc.group.state_id != "conclude" %}
-    <a href="{% url wg_submit name=doc.group.acronym %}">Edit charter text</a>
-    {% endif %}
-
-    <a href="{% url wg_startstop_process name=doc.group.acronym option='abandon' %}">Abandon effort</a>
-
-    {% else %}
-    <a href="{% url wg_startstop_process name=doc.group.acronym option='recharter' %}">Recharter</a>
-    {% endif %}
-
-    {% endif %}
-
-    <a href="/feed/wgcomments/{{ doc.group.acronym }}/">Atom feed</a>
+    <a href="/feed/wgchanges/{{ doc.group.acronym }}/">Atom feed</a>
   </div>
 </div>
 
 <p>Other versions: <a href="{{ txt_url }}">plain text</a></p>
 
-<h3>Charter {{ doc.name }}-{{ doc.rev }}</h3>
+<h3>Charter {{ doc.name }}-{{ doc.rev }}
+{% if user|has_role:"Area Director,Secretariat" and chartering and doc.group.state_id != "conclude" %}
+<a class="edit" href="{% url wg_submit name=doc.group.acronym %}">Edit charter text</a>
+{% endif %}
+</h3>
 
 <div class="markup_draft">
 {{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
diff --git a/static/css/doc.css b/static/css/doc.css
index 158b596af..0de2a23ae 100644
--- a/static/css/doc.css
+++ b/static/css/doc.css
@@ -22,3 +22,5 @@
 
 .writeup pre.editable { background-color: #efefff; min-height: 3em; }
 .writeup a.edit { float: right; }
+
+h3 a.edit { font-weight: normal; font-size: 13px; display: inline-block; margin-left: 0.5em;}