diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index 8fab9e120..4c131542d 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -31,7 +31,7 @@
 
       <tr>
 	<th>Document</th>
-	<th>
+	<th class="text-right">
 	  {% if doc.get_state_slug != "approved" %}
 	    Proposed charter
 	  {% else %}
@@ -49,8 +49,8 @@
 	</td>
       </tr>
 
-      <tr>
-        <td class="plain"></td>
+      <tr class="plain">
+        <td></td>
 	<th>Title</th>
 	<td class="edit">
 	  {% if not snapshot and can_manage %}
@@ -60,15 +60,15 @@
 	<td>{{ doc.title }}</td>
       </tr>
 
-      <tr>
-        <td class="plain"></td>
+      <tr class="plain">
+        <td></td>
 	<th>Last updated</th>
 	<td class="edit"></td>
 	<td>{{ doc.time|date:"Y-m-d" }}</td>
       </tr>
 
-      <tr>
-        <td class="plain"></td>
+      <tr class="plain">
+        <td></td>
 	<th><a href="/doc/help/state/charter/">State</a></th>
 	<td class="edit">
 	  {% if not snapshot and can_manage %}
@@ -92,7 +92,7 @@
     <tbody>
       <tr>
 	<th>WG</th>
-	<th>State</th>
+	<th class="text-right">State</th>
 	<td class="edit"></td>
 	<td>{{ group.state.name }}</td>
       </tr>
@@ -101,7 +101,7 @@
     <tbody>
       <tr>
 	<th>IESG</th>
-	<th>Responsible AD</th>
+	<th class="text-right">Responsible AD</th>
 	<td class="edit">
 	  {% if can_manage %}
 	    {% doc_edit_button "charter_edit_ad" name=doc.name %}
@@ -113,8 +113,8 @@
       </tr>
 
       {% if not snapshot and chartering %}
-	<tr>
-	  <td class="plain"></td>
+	<tr class="plain">
+	  <td></td>
 	  <th>Telechat date</th>
 	  <td class="edit">
 	    {% if can_manage %}
@@ -135,8 +135,8 @@
       </tr>
       {% endif %}
 
-      <tr>
-	<td class="plain"></td>
+      <tr class="plain">
+	<td></td>
 	<th>Send notices to</th>
 	<td class="edit">
 	  {% if can_manage %}
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index 254575a33..456c3f73e 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -26,7 +26,7 @@
     <tbody>
       <tr>
 	<th>Document</th>
-	<th>
+	<th class="text-right">
 	  {% if doc.get_state_slug not in approved_states %}
 	    Proposed conflict review
 	  {% else %}
@@ -46,15 +46,15 @@
 	</td>
       </tr>
 
-      <tr>
-      	<td class="plain"></td>
+      <tr class="plain">
+      	<td></td>
 	<th>Last updated</th>
 	<td class="edit"></td>
 	<td>{{ doc.time|date:"Y-m-d" }}</td>
       </tr>
 
-      <tr>
-      	<td class="plain"></td>
+      <tr class="plain">
+      	<td></td>
 	<th><a href="/doc/help/state/conflict-review/">State</a></th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@@ -70,7 +70,7 @@
     <tbody>
       <tr>
 	<th>IESG</th>
-	<th>Shepherding AD</th>
+	<th class="text-right">Shepherding AD</th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
 	    <a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
@@ -82,8 +82,8 @@
       </tr>
 
       {% if not snapshot %}
-	<tr>
-	  <td class="plain"></td>
+	<tr class="plain">
+	  <td></td>
 	  <th>Telechat date</th>
 	  <td class="edit">
 	    {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@@ -105,8 +105,8 @@
 	</tr>
       {% endif %}
 
-      <tr>
-	<td class="plain"></td>
+      <tr class="plain">
+	<td></td>
 	<th>Send notices to</th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 499669943..177b5bc0d 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -41,7 +41,7 @@
     <tbody>
       <tr>
 	<th>Document</th>
-	<th>Type</th>
+	<th class="text-right">Type</th>
 	<td class="edit"></td>
 	<td>
 	  {% if doc.get_state_slug == "rfc" %}
@@ -63,8 +63,8 @@
 	</td>
       </tr>
 
-      <tr>
-      	<th class="plain"></th>
+      <tr class="plain">
+      	<th></th>
 	<th>Last updated</th>
 	<td class="edit"></td>
 	<td>
@@ -76,8 +76,8 @@
       </tr>
 
       {% if replaces or can_edit_stream_info %}
-	<tr>
-	  <th class="plain"></th>
+	<tr class="plain">
+	  <th></th>
 	  <th>Replaces</th>
 	  <td class="edit">
 	    {% if can_edit_stream_info %}
@@ -91,8 +91,8 @@
       {% endif %}
 
       {% if replaced_by %}
-	<tr>
-	  <th class="plain"></th>
+	<tr class="plain">
+	  <th></th>
 	  <th>Replaced by</th>
 	  <td class="edit"></td>
 	  <td>
@@ -101,8 +101,8 @@
 	</tr>
       {% endif %}
       
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Stream</th>
 	<td class="edit">
 	  {% if can_change_stream %}
@@ -115,8 +115,8 @@
       </tr>
 
       {% if doc.get_state_slug != "rfc" %}
-	<tr>
-	  <th class="plain"></th>
+	<tr class="plain">
+	  <th></th>
 	  <th>Intended RFC status</th>
 	  <td class="edit">
 	    {% if can_edit or can_edit_stream_info %}
@@ -129,8 +129,8 @@
 	</tr>
       {% endif %}
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Formats</th>
 	<td class="edit"></td>
 	<td>
@@ -148,8 +148,8 @@
       </tr>
 
       {% if conflict_reviews %}
-	<tr>
-          <th class="plain"></th>
+	<tr class="plain">
+          <th></th>
 	  <th>IETF conflict review</th>
 	  <td class="edit"></td>
 	  <td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td>
@@ -161,7 +161,7 @@
       <tr>
 	<th>Stream</th>
 	{% if doc.stream %}
-	  <th>
+	  <th class="text-right">
 	     {% if doc.stream.slug != "legacy" %}
 	     <a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}">
 		{% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state
@@ -187,15 +187,15 @@
 	    {% endif %}
 	  </td>
 	{% else %}
-	  <th>Stream state</th>
+	  <th class="text-right">Stream state</th>
 	  <td class="edit"></td>
 	  <td>(No stream defined)</td>
 	{% endif %}
       </tr>
 
       {% if consensus %}
-	<tr>
-	  <th class="plain"></th>
+	<tr class="plain">
+	  <th></th>
 	  <th>Consensus</th>
 	  <td class="edit">
 	    {% if can_edit or can_edit_stream_info %}
@@ -208,8 +208,8 @@
 	</tr>
       {% endif %}
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Document shepherd</th>
 	<td class="edit">
 	  {% if can_edit_stream_info %}
@@ -224,8 +224,8 @@
       </tr>
 
       {% if shepherd_writeup or can_edit_shepherd_writeup %}
-	<tr>
-	  <th class="plain"></th>
+	<tr class="plain">
+	  <th></th>
 	  <th>Shepherd write-up</th>
 	  <td class="edit">
 	    {% if can_edit_shepherd_writeup %}
@@ -247,8 +247,8 @@
       {% endif %}
 
       {% if published and started_iesg_process and published.time < started_iesg_process.time %}
-	<tr>
-	  <th class="plain"></th>
+	<tr class="plain">
+	  <th></th>
 	  <th colspan="3" class="warning">This information refers to IESG processing after the RFC was initially published:</th>
 	</tr>
       {% endif %}
@@ -257,7 +257,7 @@
     <tbody>
       <tr>
 	<th>IESG</th>
-	<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
+	<th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
 	<td class="edit">
 	  {% if iesg_state and can_edit %}
 	    <a class="btn btn-default btn-xs" href="{% url "doc_change_state" name=doc.name %}">Edit</a>
@@ -268,8 +268,8 @@
 	</td>
       </tr>
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Telechat date</th>
 	<td class="edit">
 	  {% if can_edit %}
@@ -294,8 +294,8 @@
 	</td>
       </tr>
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Responsible AD</th>
 	<td class="edit">
 	  {% if can_edit %}
@@ -309,8 +309,8 @@
 
       {% if iesg_state %}
 	{% if doc.note or can_edit %}
-	  <tr>
-	    <th class="plain"></th>
+	  <tr class="plain">
+	    <th></th>
 	    <th>IESG note</th>
 	    <td class="edit">
 	      {% if can_edit %}
@@ -324,8 +324,8 @@
 	{% endif %}
       {% endif %}
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Send notices to</th>
 	<td class="edit">
 	  {% if can_edit_notify %}
@@ -343,7 +343,7 @@
     <tbody>
       <tr>
 	<th>IANA</th>
-	<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
+	<th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
 	<td class="edit">
 	  {% if can_edit_iana_state %}
 	    <a class="btn btn-default btn-xs" href="{% url "doc_change_iana_state" name=doc.name state_type="iana-review" %}">Edit</a>
@@ -354,8 +354,8 @@
 	</td>
       </tr>
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>IANA action state</th>
 	<td class="edit">
 	  {% if can_edit_iana_state %}
@@ -370,11 +370,10 @@
     {% endif %}
 
     <tbody>
-
       {% if rfc_editor_state %}
 	<tr>
 	  <th>RFC Editor</th>
-	  <th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></th>
+	  <th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></th>
 	  <td class="edit"></td>
 	  <td><a href="https://www.rfc-editor.org/queue2.html#{{ doc.name }}">{{ rfc_editor_state }}</a></td>
 	</tr>
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 3817a5a11..c02cd876f 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -26,7 +26,7 @@
     <tbody>
       <tr>
 	<th>Document</th>
-	<th>
+	<th class="text-right">
 	  {% if doc.get_state_slug not in approved_states %}
 	    Proposed status change
 	  {% else %}
@@ -46,8 +46,8 @@
 	</td>
       </tr>
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Last updated</th>
 	<td class="edit"></td>
 	<td>{{ doc.time|date:"Y-m-d" }}</td>
@@ -56,16 +56,16 @@
 
     {% regroup sorted_relations by relationship.name as relation_groups %}
       {% for relation_group in relation_groups %}
-	<tr>
-          <th class="plain"></th>
+	<tr class="plain">
+          <th></th>
 	  <th>{{relation_group.grouper}}</th>
 	  <td class="edit"></td>
 	  <td>{% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
 	</tr>
       {% endfor %}
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th><a href="{% url "state_help" type="status-change" %}">State</a></th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@@ -81,7 +81,7 @@
     <tbody>
       <tr>
 	<th>IESG</th>
-	<th>Telechat date</th>
+	<th class="text-right">Telechat date</th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
 	    <a class="btn btn-default btn-xs pull-right" href="{% url "status_change_telechat_date" name=doc.name %}">Edit</a>
@@ -101,8 +101,8 @@
 	</td>
       </tr>
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Shepherding AD</th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@@ -114,8 +114,8 @@
 	</td>
       </tr>
 
-      <tr>
-        <th class="plain"></th>
+      <tr class="plain">
+        <th></th>
 	<th>Send notices to</th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
diff --git a/static/css/ietf.css b/static/css/ietf.css
index a2e02148c..247fea1b5 100644
--- a/static/css/ietf.css
+++ b/static/css/ietf.css
@@ -391,8 +391,9 @@ footer {
 }
 */
 
-
-table tbody td.plain, table tbody th.plain { border-top: 0; }
+tbody tr.plain td, tbody tr.plain th { border-top: 0px; }
+tbody tr.plain th { text-align: right; width: 9em; }
+tbody tr.plain:first-child th { text-align: left; width: 6em; }
 
 td.ad div { border-bottom: solid #ccc 1px; }