diff --git a/ietf/templates/submit/draft_edit.html b/ietf/templates/submit/draft_edit.html
index 009bf34fc..2893654a1 100644
--- a/ietf/templates/submit/draft_edit.html
+++ b/ietf/templates/submit/draft_edit.html
@@ -111,8 +111,8 @@ Please fix the following errors.
 <tr{% if form.errors.title %} class="warning"{% endif %}><th>Title</th><td>{{ form.title }}{{ form.errors.title }}</td></tr>
 <tr{% if form.errors.version %} class="warning"{% endif %}><th>Version</th><td>{{ form.version }}{{ form.errors.version }}</td></tr>
 <tr{% if form.errors.creation_date %} class="warning"{% endif %}><th>Creation date</th><td>{{ form.creation_date }}{{ form.errors.creation_date }}</td></tr>
-<tr{% if form.errors.pages %} class="warning"{% endif %}><th>Pages</th><td>{{ form.pages }}{{ form.errors.pages }}</td></tr>
 <tr{% if form.errors.abstract %} class="warning"{% endif %}><th>Abstract</th><td>{{ form.abstract }}{{ form.errors.abstract }}</td></tr>
+<tr{% if form.errors.pages %} class="warning"{% endif %}><th>Pages</th><td>{{ form.pages }}{{ form.errors.pages }}</td></tr>
 <tr><th>Submitter</th>
 <td>
 If you are one of the authors, then please click a button by your name to automatically fill in the submitter's information as requested below. Otherwise, Please manually enter your information.<br />
diff --git a/ietf/templates/submit/draft_status.html b/ietf/templates/submit/draft_status.html
index 011402f4e..cf73b723a 100644
--- a/ietf/templates/submit/draft_status.html
+++ b/ietf/templates/submit/draft_status.html
@@ -138,16 +138,17 @@ returned to the submitter.
 {% endif %}
 
 <table class="metadata-table">
-<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a>
+<tr><th>Document</th><td>
+   {% ifequal status.status_value "Posted" %}<a href="http://www.ietf.org/id/{{ detail.filename }}-{{detail.revision}}.txt">{{ detail.filename }}</a>{% else %}{{ detail.filename }}{% endifequal %}
+   <br/><a class="twopages_trigger" href="#">[View first two pages]</a>
 {% show_submission_files detail %}
 </td></tr>
 <tr{% if validation.warnings.revision %} class="warning"{% endif %}><th>Revision</th><td>{{ detail.revision }}<div class="warn_message">{{ validation.warnings.revision }}{% if validation.warnings.revision %}<br /><a class="twopages_trigger" href="#">[View error]</a>{% endif %}</div></td></tr>
+<tr{% if validation.warnings.group %} class="warning"{% endif %}><th>WG</th><td>{{ validation.wg|default:"Individual Submission" }}<div class="warn_message">{{ validation.warnings.group }}</div></td></tr>
+<tr{% if validation.warnings.creation_date %} class="warning"{% endif %}><th>Document date</th><td>{{ detail.creation_date }}<div class="warn_message">{{ validation.warnings.creation_date }}</div></td></tr>
 <tr><th>Submission date</th><td>{{ detail.submission_date }}</td></tr>
 <tr><th>Title</th><td>{{ detail.id_document_name }}</td></tr>
-<tr{% if validation.warnings.group %} class="warning"{% endif %}><th>WG</th><td>{{ validation.wg|default:"Individual Submission" }}<div class="warn_message">{{ validation.warnings.group }}</div></td></tr>
-<tr><th>File size</th><td>{{ detail.filesize|filesizeformat }}</td></tr>
-<tr{% if validation.warnings.creation_date %} class="warning"{% endif %}><th>Creation date</th><td>{{ detail.creation_date }}<div class="warn_message">{{ validation.warnings.creation_date }}</div></td></tr>
-<tr{% if validation.warnings.authors %} class="warning"{% endif %}><th colspan="2">Author(s) information</th></tr>
+<tr{% if validation.warnings.authors %} class="warning"{% endif %}><th colspan="2">Author information</th></tr>
 {% if validation.warnings.authors %}
 <tr class="warning"><td colspan="2"><div class="warn_message">{{ validation.warnings.authors|safe }}</div></td></tr>
 {% endif %}
@@ -156,8 +157,9 @@ returned to the submitter.
 <tr{% if validation.warnings.authors %} class="warning"{% endif %}><th class="author">Author {{ forloop.counter }}</th><td>{{ author.get_full_name }} {% if author.email.1 %}&lt;{{ author.email.1 }}&gt;{% endif %}</td></tr>
 {% endfor %}
 {% endif %}
-<tr{% if validation.warnings.pages %} class="warning"{% endif %}><th>Pages</th><td>{{ detail.txt_page_count }}<div class="warn_message">{{ validation.warnings.pages }}</div></td></tr>
 <tr{% if validation.warnings.abstract %} class="warning"{% endif %}><th>Abstract</th><td>{{ detail.abstract|linebreaksbr }}<div class="warn_message">{{ validation.warnings.abstract }}</div></td></tr>
+<tr{% if validation.warnings.pages %} class="warning"{% endif %}><th>Pages</th><td>{{ detail.txt_page_count }}<div class="warn_message">{{ validation.warnings.pages }}</div></td></tr>
+<tr><th>File size</th><td>{{ detail.filesize|filesizeformat }}</td></tr>
 </table>
 
 {% if allow_edit %} 
diff --git a/ietf/templates/submit/manual_post_mail.txt b/ietf/templates/submit/manual_post_mail.txt
index 995dcc114..50c468f4b 100644
--- a/ietf/templates/submit/manual_post_mail.txt
+++ b/ietf/templates/submit/manual_post_mail.txt
@@ -1,17 +1,18 @@
-Manual Posting Requested for the following Internet-Draft:
+Manual posting has been requested for the following Internet-Draft:
 
 I-D Submission Tool URL: http://{{ domain }}/submit/status/{{ draft.submission_id }}/
 
 File name: {{ draft.filename }}
+Version: {{ draft.revision }}
 Submission date: {{ draft.submission_date }}
 WG: {{ draft.group_acronym|default:"Individual Submission" }} {% if form.validation.warnings.group %}*Please note that this WG is not an active one*{% endif %}
-File size: {{ draft.filesize|filesizeformat }}
 
 Title: {{ draft.id_document_name }}
-Version: {{ draft.revision }}
-Creation date: {{ draft.creation_date }}
-Pages: {{ draft.txt_page_count }}
+Document date: {{ draft.creation_date }}
 Abstract: {{ draft.abstract }}
+Pages: {{ draft.txt_page_count }}
+File size: {{ draft.filesize|filesizeformat }}
+
 Submitter: {{ form.cleaned_data.first_name }} {{ form.cleaned_data.last_name }} <{{ form.cleaned_data.email }}>
 
 Author(s):
diff --git a/ietf/templates/submit/submission_approval.txt b/ietf/templates/submit/submission_approval.txt
index 1368e75c4..9fda7c059 100644
--- a/ietf/templates/submit/submission_approval.txt
+++ b/ietf/templates/submit/submission_approval.txt
@@ -3,15 +3,16 @@ WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revisio
 I-D Submission Tool URL: http://{{ domain }}/submit/status/{{ draft.submission_id }}/
 
 File name: {{ draft.filename }}
+Version: {{ draft.revision }}
 Submission date: {{ draft.submission_date }}
 WG: {{ draft.group_acronym|default:"Individual Submission" }}
-File size: {{ draft.filesize|filesizeformat }}
 
 Title: {{ draft.id_document_name }}
-Version: {{ draft.revision }}
-Creation date: {{ draft.creation_date }}
-Pages: {{ draft.txt_page_count }}
+Document date: {{ draft.creation_date }}
 Abstract: {{ draft.abstract }}
+Pages: {{ draft.txt_page_count }}
+File size: {{ draft.filesize|filesizeformat }}
+
 Submitter: {{ submitter.first_name }} {{ submitter.last_name }} <{{ submitter.email_address }}>
 
 Author(s):