diff --git a/ietf/ipr/forms.py b/ietf/ipr/forms.py
index d65105437..1a8b6177d 100644
--- a/ietf/ipr/forms.py
+++ b/ietf/ipr/forms.py
@@ -289,5 +289,5 @@ class SearchForm(forms.Form):
 
 class StateForm(forms.Form):
     state = forms.ModelChoiceField(queryset=IprDisclosureStateName.objects,label="New State",empty_label=None)
-    private = forms.BooleanField(required=False,help_text="If this box is checked the comment will not appear in the disclosure's public history view.")
-    comment = forms.CharField(required=False, widget=forms.Textarea)
+    comment = forms.CharField(required=False, widget=forms.Textarea, help_text="You may add a comment to be included in the disclosure history.")
+    private = forms.BooleanField(label="Private comment", required=False, help_text="If this box is checked the comment will not appear in the disclosure's public history view.")
diff --git a/ietf/templates/ipr/state.html b/ietf/templates/ipr/state.html
index 94aa26f74..a35086c25 100644
--- a/ietf/templates/ipr/state.html
+++ b/ietf/templates/ipr/state.html
@@ -1,26 +1,20 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
 
 {% block title %}Change State of {{ ipr.title }}{% endblock %}
 
-{% block pagehead %}
-<link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
-{% endblock %}
-
 {% block content %}
-<h1>Change State of {{ ipr }}</h1>
+  <h1>Change State<br><small>{{ ipr }}</small></h1>
 
-<p>You may add a comment to be included in the disclosure history.</p>
+{% bootstrap_messages %}
 
-<form class="add-comment" action="" method="post">{% csrf_token %}
-  <table>
-  {{ form.as_table }}
-  <tr>
-    <td></td>
-    <td class="actions">
-      <a href="{% url "ipr_show" id=ipr.id %}">Back</a>
-      <input type="submit" value="Submit"/>
-    </td>
-  </tr>
-  </table>
+<form role="form" class="add-comment" method="post">{% csrf_token %}
+  {% bootstrap_form form %}
+
+  {% buttons %}
+  <button type="submit" class="btn btn-primary">Save</button>
+  <a class="btn btn-default pull-right" href="{% url "ipr_show" id=ipr.id %}">Back</a>
+  {% endbuttons %}
 </form>
 {% endblock %}