diff --git a/docs_theme/base.html b/docs_theme/base.html
index 4ec726b0a..46992f5df 100644
--- a/docs_theme/base.html
+++ b/docs_theme/base.html
@@ -57,12 +57,10 @@
 <body onload="prettyPrint()" class="{% if current_page and current_page.is_homepage %}index{% endif %}-page">
 
   <div class="wrapper">
-
     {% include "nav.html" %}
 
     <div class="body-content">
       <div class="container-fluid">
-
         <!-- Search Modal -->
         <div id="mkdocs_search_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
           <div class="modal-header">
@@ -85,25 +83,16 @@
         </div>
 
         <div class="row-fluid">
-
           <div class="span3">
-            <!-- TODO
-            <p style="margin-top: -12px">
-              <a class="btn btn-mini btn-primary" style="width: 60px">&laquo; previous</a>
-              <a class="btn btn-mini btn-primary" style="float: right; margin-right: 8px; width: 60px;">next &raquo;</a>
-            </p>
-          -->
             <div id="table-of-contents">
               <ul class="nav nav-list side-nav well sidebar-nav-fixed">
-
                 {% if current_page and current_page.is_homepage %}
-                    <li class="main">
-                        <a href="#">Django REST framework</a>
-                    </li>
+                  <li class="main">
+                    <a href="#">Django REST framework</a>
+                  </li>
                 {% endif %}
 
                 {% for toc_item in toc %}
-
                   <li class="{% if current_page and not current_page.is_homepage %}main{% endif %}">
                     <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
                   </li>
@@ -113,25 +102,21 @@
                       <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
                     </li>
                   {% endfor %}
-
                 {% endfor %}
 
                 {% if current_page and current_page.is_homepage %}
-                <div class="promo">
-                  <hr/>
-                  <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
-                </div>
+                  <div class="promo">
+                    <hr/>
+                    <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
+                  </div>
                 {% endif %}
-
               </ul>
 
             </div>
           </div>
 
           <div id="main-content" class="span9">
-
             {% block content %}
-
               {% if meta.source %}
                 {% for filename in meta.source %}
                   <a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/{{ filename }}">
@@ -141,20 +126,14 @@
               {% endif %}
 
               {{ content }}
-
             {% endblock %}
 
-          </div>
-          <!--/span-->
-        </div>
-        <!--/row-->
-      </div>
-      <!--/.fluid-container-->
-    </div>
-    <!--/.body content-->
+          </div> <!--/span-->
+        </div> <!--/row-->
+      </div> <!--/.fluid-container-->
+    </div> <!--/.body content-->
     <div id="push"></div>
-  </div>
-  <!--/.wrapper -->
+  </div> <!--/.wrapper -->
 
   <footer class="span12">
     <p>Documentation built with <a href="http://www.mkdocs.org/">MkDocs</a>.</a>
diff --git a/rest_framework/templates/rest_framework/api_form.html b/rest_framework/templates/rest_framework/api_form.html
index 96f924ed8..166988324 100644
--- a/rest_framework/templates/rest_framework/api_form.html
+++ b/rest_framework/templates/rest_framework/api_form.html
@@ -1,8 +1,8 @@
 {% load rest_framework %}
 {% csrf_token %}
 {% for field in form %}
-    {% if not field.read_only %}
-        {% render_field field style=style %}
-    {% endif %}
+  {% if not field.read_only %}
+    {% render_field field style=style %}
+  {% endif %}
 {% endfor %}
 <!-- form.non_field_errors -->
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 877387f28..f644e6ec7 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -3,257 +3,242 @@
 {% load rest_framework %}
 <!DOCTYPE html>
 <html>
-    <head>
-        {% block head %}
+<head>
+  {% block head %}
 
-            {% block meta %}
-                <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-                <meta name="robots" content="NONE,NOARCHIVE" />
+    {% block meta %}
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+      <meta name="robots" content="NONE,NOARCHIVE" />
+    {% endblock %}
+
+    <title>{% block title %}Django REST framework{% endblock %}</title>
+
+    {% block style %}
+      {% block bootstrap_theme %}
+        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>
+        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
+      {% endblock %}
+
+      <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/>
+      <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>
+    {% endblock %}
+
+  {% endblock %}
+</head>
+
+{% block body %}
+<body class="{% block bodyclass %}{% endblock %}">
+
+  <div class="wrapper">
+    {% block navbar %}
+      <div class="navbar navbar-static-top {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}">
+        <div class="container">
+          <span>
+            {% block branding %}
+              <a class='navbar-brand' rel="nofollow" href='http://www.django-rest-framework.org'>
+                  Django REST framework <span class="version">{{ version }}</span>
+              </a>
             {% endblock %}
-
-            <title>{% block title %}Django REST framework{% endblock %}</title>
-
-            {% block style %}
-                {% block bootstrap_theme %}
-                    <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>
-                    <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
-                {% endblock %}
-                <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/>
-                <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>
+          </span>
+          <ul class="nav navbar-nav pull-right">
+            {% block userlinks %}
+              {% if user.is_authenticated %}
+                {% optional_logout request user %}
+              {% else %}
+                {% optional_login request %}
+              {% endif %}
             {% endblock %}
+          </ul>
+        </div>
+      </div>
+    {% endblock %}
 
-        {% endblock %}
-    </head>
+    <div class="container">
+      {% block breadcrumbs %}
+        <ul class="breadcrumb">
+          {% for breadcrumb_name, breadcrumb_url in breadcrumblist %}
+            {% if forloop.last %}
+              <li class="active"><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li>
+            {% else %}
+              <li><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li>
+            {% endif %}
+          {% endfor %}
+        </ul>
+      {% endblock %}
 
-    {% block body %}
-    <body class="{% block bodyclass %}{% endblock %}">
+      <!-- Content -->
+      <div id="content">
 
-        <div class="wrapper">
+        {% if 'GET' in allowed_methods %}
+          <form id="get-form" class="pull-right">
+            <fieldset>
+              <div class="btn-group format-selection">
+                <a class="btn btn-primary js-tooltip" href='{{ request.get_full_path }}' rel="nofollow" title="Make a GET request on the {{ name }} resource">GET</a>
 
-            {% block navbar %}
-                <div class="navbar navbar-static-top {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}">
-                    <div class="container">
-                        <span>
-                            {% block branding %}
-                                <a class='navbar-brand' rel="nofollow" href='http://www.django-rest-framework.org'>
-                                    Django REST framework <span class="version">{{ version }}</span>
-                                </a>
-                            {% endblock %}
-                        </span>
-                        <ul class="nav navbar-nav pull-right">
-                            {% block userlinks %}
-                                {% if user.is_authenticated %}
-                                    {% optional_logout request user %}
-                                {% else %}
-                                    {% optional_login request %}
-                                {% endif %}
-                            {% endblock %}
-                        </ul>
-                    </div>
-                </div>
-            {% endblock %}
-
-            <div class="container">
-            {% block breadcrumbs %}
-                <ul class="breadcrumb">
-                    {% for breadcrumb_name, breadcrumb_url in breadcrumblist %}
-                        {% if forloop.last %}
-                            <li class="active"><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li>
-                        {% else %}
-                            <li><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li>
-                        {% endif %}
-                    {% endfor %}
+                <button class="btn btn-primary dropdown-toggle js-tooltip" data-toggle="dropdown" title="Specify a format for the GET request">
+                  <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu">
+                  {% for format in available_formats %}
+                    <li>
+                      <a class="js-tooltip format-option" href='{% add_query_param request api_settings.URL_FORMAT_OVERRIDE format %}' rel="nofollow" title="Make a GET request on the {{ name }} resource with the format set to `{{ format }}`">{{ format }}</a>
+                    </li>
+                  {% endfor %}
                 </ul>
-            {% endblock %}
+              </div>
+            </fieldset>
+          </form>
+        {% endif %}
 
-            <!-- Content -->
-            <div id="content">
+        {% if options_form %}
+          <form class="button-form" action="{{ request.get_full_path }}" method="POST">
+            {% csrf_token %}
+            <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="OPTIONS" />
+            <button class="btn btn-primary js-tooltip" title="Make an OPTIONS request on the {{ name }} resource">OPTIONS</button>
+          </form>
+        {% endif %}
 
-                {% if 'GET' in allowed_methods %}
-                    <form id="get-form" class="pull-right">
-                        <fieldset>
-                            <div class="btn-group format-selection">
-                                <a class="btn btn-primary js-tooltip" href='{{ request.get_full_path }}'
-                                     rel="nofollow" title="Make a GET request on the {{ name }} resource">GET</a>
+        {% if delete_form %}
+          <form class="button-form" action="{{ request.get_full_path }}" method="POST">
+            {% csrf_token %}
+            <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE" />
+            <button class="btn btn-danger js-tooltip" title="Make a DELETE request on the {{ name }} resource">DELETE</button>
+          </form>
+        {% endif %}
 
-                                <button class="btn btn-primary dropdown-toggle js-tooltip" data-toggle="dropdown"
-                                        title="Specify a format for the GET request">
-                                    <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    {% for format in available_formats %}
-                                        <li>
-                                            <a class="js-tooltip format-option"
-                                                href='{% add_query_param request api_settings.URL_FORMAT_OVERRIDE format %}'
-                                                 rel="nofollow"
-                                               title="Make a GET request on the {{ name }} resource with the format set to `{{ format }}`">
-                                                {{ format }}
-                                            </a>
-                                        </li>
-                                    {% endfor %}
-                                </ul>
-                            </div>
-                        </fieldset>
-                    </form>
-                {% endif %}
+          <div class="content-main">
+            <div class="page-header">
+                <h1>{{ name }}</h1>
+            </div>
+            <div style="float:left">
+              {% block description %}
+                {{ description }}
+              {% endblock %}
+            </div>
 
-                {% if options_form %}
-                    <form class="button-form" action="{{ request.get_full_path }}" method="POST">
-                        {% csrf_token %}
-                        <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="OPTIONS" />
-                        <button class="btn btn-primary js-tooltip"
-                                title="Make an OPTIONS request on the {{ name }} resource">OPTIONS</button>
-                    </form>
-                {% endif %}
+            {% if paginator %}
+              <nav style="float: right">
+                {% get_pagination_html paginator %}
+              </nav>
+            {% endif %}
 
-                {% if delete_form %}
-                    <form class="button-form" action="{{ request.get_full_path }}" method="POST">
-                        {% csrf_token %}
-                        <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE" />
-                        <button class="btn btn-danger js-tooltip"
-                                title="Make a DELETE request on the {{ name }} resource">DELETE</button>
-                    </form>
-                {% endif %}
+            <div class="request-info" style="clear: both" >
+              <pre class="prettyprint"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre>
+            </div>
 
-                <div class="content-main">
-                    <div class="page-header">
-                        <h1>{{ name }}</h1>
-                    </div>
-                    <div style="float:left">
-                    {% block description %}
-                        {{ description }}
-                    {% endblock %}
-                    </div>
-
-                    {% if paginator %}
-                        <nav style="float: right">
-                        {% get_pagination_html paginator %}
-                        </nav>
-                    {% endif %}
-
-                    <div class="request-info" style="clear: both" >
-                        <pre class="prettyprint"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre>
-                    </div>
-                    <div class="response-info">
-                        <pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %}
+            <div class="response-info">
+              <pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %}
 {% for key, val in response_headers.items %}<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize_quoted_links }}</span>
 {% endfor %}
 </span>{{ content|urlize_quoted_links }}</pre>{% endautoescape %}
-                    </div>
-                </div>
-
-                {% if display_edit_forms %}
-
-                    {% if post_form or raw_data_post_form %}
-                        <div {% if post_form %}class="tabbable"{% endif %}>
-                            {% if post_form %}
-                                <ul class="nav nav-tabs form-switcher">
-                                    <li>
-                                        <a name='html-tab' href="#post-object-form" data-toggle="tab">HTML form</a>
-                                    </li>
-                                    <li>
-                                        <a name='raw-tab' href="#post-generic-content-form" data-toggle="tab">Raw data</a>
-                                    </li>
-                                </ul>
-                            {% endif %}
-                            <div class="well tab-content">
-                                {% if post_form %}
-                                    <div class="tab-pane" id="post-object-form">
-                                        {% with form=post_form %}
-                                            <form action="{{ request.get_full_path }}"
-                                                  method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
-                                                <fieldset>
-                                                    {{ post_form }}
-                                                    <div class="form-actions">
-                                                        <button class="btn btn-primary"
-                                                                title="Make a POST request on the {{ name }} resource">POST</button>
-                                                    </div>
-                                                </fieldset>
-                                            </form>
-                                        {% endwith %}
-                                    </div>
-                                {% endif %}
-                                <div {% if post_form %}class="tab-pane"{% endif %} id="post-generic-content-form">
-                                    {% with form=raw_data_post_form %}
-                                        <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
-                                            <fieldset>
-                                                {% include "rest_framework/raw_data_form.html" %}
-                                                <div class="form-actions">
-                                                    <button class="btn btn-primary"
-                                                            title="Make a POST request on the {{ name }} resource">POST</button>
-                                                </div>
-                                            </fieldset>
-                                        </form>
-                                    {% endwith %}
-                                </div>
-                            </div>
-                        </div>
-                    {% endif %}
-
-                    {% if put_form or raw_data_put_form or raw_data_patch_form %}
-                        <div {% if put_form %}class="tabbable"{% endif %}>
-                            {% if put_form %}
-                                <ul class="nav nav-tabs form-switcher">
-                                    <li>
-                                        <a name='html-tab' href="#put-object-form" data-toggle="tab">HTML form</a>
-                                    </li>
-                                    <li>
-                                        <a  name='raw-tab' href="#put-generic-content-form" data-toggle="tab">Raw data</a>
-                                    </li>
-                                </ul>
-                            {% endif %}
-                            <div class="well tab-content">
-                                {% if put_form %}
-                                    <div class="tab-pane" id="put-object-form">
-                                        <form action="{{ request.get_full_path }}"
-                                              method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
-                                            <fieldset>
-                                                {{ put_form }}
-                                                <div class="form-actions">
-                                                    <button class="btn btn-primary js-tooltip"
-                                                             name="{{ api_settings.FORM_METHOD_OVERRIDE }}"
-                                                            value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
-                                                </div>
-                                            </fieldset>
-                                        </form>
-                                    </div>
-                                {% endif %}
-                                <div {% if put_form %}class="tab-pane"{% endif %} id="put-generic-content-form">
-                                    {% with form=raw_data_put_or_patch_form %}
-                                        <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
-                                            <fieldset>
-                                                {% include "rest_framework/raw_data_form.html" %}
-                                                <div class="form-actions">
-                                                    {% if raw_data_put_form %}
-                                                        <button class="btn btn-primary js-tooltip"
-                                                                 name="{{ api_settings.FORM_METHOD_OVERRIDE }}"
-                                                                value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
-                                                    {% endif %}
-                                                    {% if raw_data_patch_form %}
-                                                        <button class="btn btn-primary js-tooltip"
-                                                                 name="{{ api_settings.FORM_METHOD_OVERRIDE }}"
-                                                                value="PATCH" title="Make a PATCH request on the {{ name }} resource">PATCH</button>
-                                                    {% endif %}
-                                                </div>
-                                            </fieldset>
-                                        </form>
-                                    {% endwith %}
-                                </div>
-                            </div>
-                        </div>
-                    {% endif %}
-                {% endif %}
             </div>
-            <!-- END Content -->
-            </div><!-- /.container -->
-        </div><!-- ./wrapper -->
+          </div>
 
-        {% block script %}
-            <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
-            <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
-            <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
-            <script src="{% static "rest_framework/js/default.js" %}"></script>
-        {% endblock %}
-    </body>
-    {% endblock %}
+          {% if display_edit_forms %}
+
+            {% if post_form or raw_data_post_form %}
+              <div {% if post_form %}class="tabbable"{% endif %}>
+                {% if post_form %}
+                  <ul class="nav nav-tabs form-switcher">
+                    <li>
+                      <a name='html-tab' href="#post-object-form" data-toggle="tab">HTML form</a>
+                    </li>
+                    <li>
+                      <a name='raw-tab' href="#post-generic-content-form" data-toggle="tab">Raw data</a>
+                    </li>
+                  </ul>
+                {% endif %}
+
+                <div class="well tab-content">
+                  {% if post_form %}
+                    <div class="tab-pane" id="post-object-form">
+                      {% with form=post_form %}
+                        <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
+                          <fieldset>
+                            {{ post_form }}
+                            <div class="form-actions">
+                              <button class="btn btn-primary" title="Make a POST request on the {{ name }} resource">POST</button>
+                            </div>
+                          </fieldset>
+                        </form>
+                      {% endwith %}
+                    </div>
+                  {% endif %}
+
+                  <div {% if post_form %}class="tab-pane"{% endif %} id="post-generic-content-form">
+                    {% with form=raw_data_post_form %}
+                      <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
+                        <fieldset>
+                          {% include "rest_framework/raw_data_form.html" %}
+                          <div class="form-actions">
+                            <button class="btn btn-primary" title="Make a POST request on the {{ name }} resource">POST</button>
+                          </div>
+                        </fieldset>
+                      </form>
+                    {% endwith %}
+                  </div>
+                </div>
+              </div>
+            {% endif %}
+
+            {% if put_form or raw_data_put_form or raw_data_patch_form %}
+              <div {% if put_form %}class="tabbable"{% endif %}>
+                {% if put_form %}
+                  <ul class="nav nav-tabs form-switcher">
+                    <li>
+                      <a name='html-tab' href="#put-object-form" data-toggle="tab">HTML form</a>
+                    </li>
+                    <li>
+                      <a  name='raw-tab' href="#put-generic-content-form" data-toggle="tab">Raw data</a>
+                    </li>
+                  </ul>
+                {% endif %}
+
+                <div class="well tab-content">
+                  {% if put_form %}
+                    <div class="tab-pane" id="put-object-form">
+                      <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
+                        <fieldset>
+                          {{ put_form }}
+                          <div class="form-actions">
+                            <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
+                          </div>
+                        </fieldset>
+                      </form>
+                    </div>
+                  {% endif %}
+
+                  <div {% if put_form %}class="tab-pane"{% endif %} id="put-generic-content-form">
+                    {% with form=raw_data_put_or_patch_form %}
+                      <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
+                        <fieldset>
+                          {% include "rest_framework/raw_data_form.html" %}
+                          <div class="form-actions">
+                            {% if raw_data_put_form %}
+                              <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
+                            {% endif %}
+                            {% if raw_data_patch_form %}
+                              <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PATCH" title="Make a PATCH request on the {{ name }} resource">PATCH</button>
+                              {% endif %}
+                          </div>
+                        </fieldset>
+                      </form>
+                    {% endwith %}
+                  </div>
+                </div>
+              </div>
+            {% endif %}
+          {% endif %}
+      </div><!-- /.content -->
+    </div><!-- /.container -->
+  </div><!-- ./wrapper -->
+
+  {% block script %}
+    <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
+    <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
+    <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
+    <script src="{% static "rest_framework/js/default.js" %}"></script>
+  {% endblock %}
+</body>
+{% endblock %}
 </html>
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox.html b/rest_framework/templates/rest_framework/horizontal/checkbox.html
index 07a7308f0..1047de85c 100644
--- a/rest_framework/templates/rest_framework/horizontal/checkbox.html
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox.html
@@ -1,16 +1,20 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    <div class="col-sm-offset-2 col-sm-10">
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
-                {% if field.label %}{{ field.label }}{% endif %}
-            </label>
-        </div>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
+  <div class="col-sm-offset-2 col-sm-10">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
+          {% if field.label %}{{ field.label }}{% endif %}
+      </label>
     </div>
+
+    {% if field.errors %}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
+    {% endif %}
+
+    {% if field.help_text %}
+      <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
index ec7d59356..59a9acd89 100644
--- a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
@@ -1,30 +1,37 @@
 <div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
+  {% if field.label %}
+    <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <div class="col-sm-10">
     {% if style.inline %}
-        {% for key, text in field.choices.items %}
-            <label class="checkbox-inline">
-                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        {% endfor %}
+      {% for key, text in field.choices.items %}
+        <label class="checkbox-inline">
+          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+          {{ text }}
+        </label>
+      {% endfor %}
     {% else %}
-        {% for key, text in field.choices.items %}
-            <div class="checkbox">
-                <label>
-                    <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                    {{ text }}
-                </label>
-            </div>
-        {% endfor %}
+      {% for key, text in field.choices.items %}
+        <div class="checkbox">
+          <label>
+            <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+            {{ text }}
+          </label>
+        </div>
+      {% endfor %}
     {% endif %}
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-    </div>
+
+  {% if field.errors %}
+    {% for error in field.errors %}
+      <span class="help-block">{{ error }}</span>
+    {% endfor %}
+  {% endif %}
+
+  {% if field.help_text %}
+    <span class="help-block">{{ field.help_text }}</span>
+  {% endif %}
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fieldset.html
index ba3e3abae..1747d2553 100644
--- a/rest_framework/templates/rest_framework/horizontal/fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/fieldset.html
@@ -1,13 +1,16 @@
 {% load rest_framework %}
 <fieldset>
-    {% if field.label %}
-        <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
-            <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
-        </div>
+  {% if field.label %}
+    <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
+      <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">
+        {{ field.label }}
+      </legend>
+    </div>
+  {% endif %}
+
+  {% for nested_field in field %}
+    {% if not nested_field.read_only %}
+      {% render_field nested_field style=style %}
     {% endif %}
-    {% for nested_field in field %}
-        {% if not nested_field.read_only %}
-            {% render_field nested_field style=style %}
-        {% endif %}
-    {% endfor %}
+  {% endfor %}
 </fieldset>
diff --git a/rest_framework/templates/rest_framework/horizontal/form.html b/rest_framework/templates/rest_framework/horizontal/form.html
index fd15b6261..af16a0eb4 100644
--- a/rest_framework/templates/rest_framework/horizontal/form.html
+++ b/rest_framework/templates/rest_framework/horizontal/form.html
@@ -1,15 +1,16 @@
 {% load rest_framework %}
+
 <form class="form-horizontal" role="form" action="." method="POST" novalidate>
-    {% csrf_token %}
-    {% for field in form %}
-        {% if not field.read_only %}
-            {% render_field field style=style %}
-        {% endif %}
-    {% endfor %}
-    <!-- form.non_field_errors -->
-    <div class="form-group">
-        <div class="col-sm-offset-2 col-sm-10">
-            <button type="submit" class="btn btn-default">Submit</button>
-        </div>
+  {% csrf_token %}
+  {% for field in form %}
+    {% if not field.read_only %}
+      {% render_field field style=style %}
+    {% endif %}
+  {% endfor %}
+
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <button type="submit" class="btn btn-default">Submit</button>
     </div>
+  </div>
 </form>
diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html
index c41cd523a..82e6dc67c 100644
--- a/rest_framework/templates/rest_framework/horizontal/input.html
+++ b/rest_framework/templates/rest_framework/horizontal/input.html
@@ -1,14 +1,21 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+  {% if field.label %}
+    <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <div class="col-sm-10">
+    <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+
+    {% if field.errors %}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
     {% endif %}
-    <div class="col-sm-10">
-        <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
+
+    {% if field.help_text %}
+      <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
index a9ff04a62..962c333c0 100644
--- a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
@@ -1,16 +1,13 @@
 {% load rest_framework %}
+
 <fieldset>
-    {% if field.label %}
-        <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
-            <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
-        </div>
-    {% endif %}
-    <!--
-    <ul>
-    {% for child in field.value %}
-        <li>TODO</li>
-    {% endfor %}
-    </ul>
-    -->
-    <p>Lists are not currently supported in HTML input.</p>
+  {% if field.label %}
+    <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
+      <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">
+        {{ field.label }}
+      </legend>
+    </div>
+  {% endif %}
+
+  <p>Lists are not currently supported in HTML input.</p>
 </fieldset>
diff --git a/rest_framework/templates/rest_framework/horizontal/radio.html b/rest_framework/templates/rest_framework/horizontal/radio.html
index cabd09d2b..0b4948542 100644
--- a/rest_framework/templates/rest_framework/horizontal/radio.html
+++ b/rest_framework/templates/rest_framework/horizontal/radio.html
@@ -2,46 +2,54 @@
 {% trans "None" as none_choice %}
 
 <div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
+  {% if field.label %}
+    <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <div class="col-sm-10">
     {% if style.inline %}
-        {% if field.allow_null or field.allow_blank %}
-            <label class="radio-inline">
-                <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
-                {{ none_choice }}
-            </label>
-        {% endif %}
-        {% for key, text in field.choices.items %}
-            <label class="radio-inline">
-                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %} />
-                {{ text }}
-            </label>
-        {% endfor %}
+      {% if field.allow_null or field.allow_blank %}
+        <label class="radio-inline">
+          <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+          {{ none_choice }}
+        </label>
+      {% endif %}
+
+      {% for key, text in field.choices.items %}
+        <label class="radio-inline">
+          <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %} />
+          {{ text }}
+        </label>
+      {% endfor %}
     {% else %}
-        {% if field.allow_null or field.allow_blank %}
-            <div class="radio">
-                <label>
-                    <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
-                    {{ none_choice }}
-                </label>
-            </div>
-        {% endif %}
+      {% if field.allow_null or field.allow_blank %}
+        <div class="radio">
+          <label>
+            <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+            {{ none_choice }}
+          </label>
+        </div>
+      {% endif %}
         {% for key, text in field.choices.items %}
-            <div class="radio">
-                <label>
-                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %} />
-                    {{ text }}
-                </label>
-            </div>
+          <div class="radio">
+            <label>
+              <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %} />
+              {{ text }}
+            </label>
+          </div>
         {% endfor %}
     {% endif %}
+
     {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
     {% endif %}
+
     {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
+      <span class="help-block">{{ field.help_text }}</span>
     {% endif %}
-    </div>
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html
index 8a7fca370..8957eef9f 100644
--- a/rest_framework/templates/rest_framework/horizontal/select.html
+++ b/rest_framework/templates/rest_framework/horizontal/select.html
@@ -1,21 +1,28 @@
 <div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+  {% if field.label %}
+    <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <div class="col-sm-10">
+    <select class="form-control" name="{{ field.name }}">
+      {% if field.allow_null or field.allow_blank %}
+        <option value="" {% if not field.value %}selected{% endif %}>--------</option>
+      {% endif %}
+      {% for key, text in field.choices.items %}
+        <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+      {% endfor %}
+    </select>
+
+    {% if field.errors %}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
     {% endif %}
-    <div class="col-sm-10">
-        <select class="form-control" name="{{ field.name }}">
-        {% if field.allow_null or field.allow_blank %}
-            <option value="" {% if not field.value %}selected{% endif %}>--------</option>
-        {% endif %}
-        {% for key, text in field.choices.items %}
-            <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-        </select>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
+
+    {% if field.help_text %}
+      <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
index 0735f2809..407b356ff 100644
--- a/rest_framework/templates/rest_framework/horizontal/select_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
@@ -2,22 +2,29 @@
 {% trans "No items to select." as no_items %}
 
 <div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+  {% if field.label %}
+    <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <div class="col-sm-10">
+    <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}">
+      {% for key, text in field.choices.items %}
+        <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
+      {% empty %}
+          <option>{{ no_items }}</option>
+      {% endfor %}
+    </select>
+
+    {% if field.errors %}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
     {% endif %}
-    <div class="col-sm-10">
-        <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}">
-            {% for key, text in field.choices.items %}
-                <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
-            {% empty %}
-                <option>{{ no_items }}</option>
-            {% endfor %}
-        </select>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
+
+    {% if field.help_text %}
+      <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/horizontal/textarea.html b/rest_framework/templates/rest_framework/horizontal/textarea.html
index ec1075495..ab083807b 100644
--- a/rest_framework/templates/rest_framework/horizontal/textarea.html
+++ b/rest_framework/templates/rest_framework/horizontal/textarea.html
@@ -1,14 +1,21 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+  {% if field.label %}
+    <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <div class="col-sm-10">
+    <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
+
+    {% if field.errors %}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
     {% endif %}
-    <div class="col-sm-10">
-        <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
+
+    {% if field.help_text %}
+      <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/checkbox.html b/rest_framework/templates/rest_framework/inline/checkbox.html
index 71737f15f..665249a52 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox.html
@@ -1,8 +1,8 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    <div class="checkbox">
-        <label>
-            <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
-            {% if field.label %}{{ field.label }}{% endif %}
-        </label>
-    </div>
+  <div class="checkbox">
+    <label>
+      <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
+      {% if field.label %}{{ field.label }}{% endif %}
+    </label>
+  </div>
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
index 093496862..b02425a62 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
@@ -1,13 +1,14 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    {% for key, text in field.choices.items %}
+  {% if field.label %}
+    <label class="sr-only">{{ field.label }}</label>
+  {% endif %}
+
+  {% for key, text in field.choices.items %}
     <div class="checkbox">
-        <label>
-            <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-            {{ text }}
-        </label>
+      <label>
+        <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+        {{ text }}
+      </label>
     </div>
-    {% endfor %}
+  {% endfor %}
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/fieldset.html b/rest_framework/templates/rest_framework/inline/fieldset.html
index e49b42fdf..44feef889 100644
--- a/rest_framework/templates/rest_framework/inline/fieldset.html
+++ b/rest_framework/templates/rest_framework/inline/fieldset.html
@@ -1,6 +1,6 @@
 {% load rest_framework %}
 {% for nested_field in field %}
-    {% if not nested_field.read_only %}
-        {% render_field nested_field style=style %}
-    {% endif %}
+  {% if not nested_field.read_only %}
+    {% render_field nested_field style=style %}
+  {% endif %}
 {% endfor %}
diff --git a/rest_framework/templates/rest_framework/inline/form.html b/rest_framework/templates/rest_framework/inline/form.html
index 6a0ea81d3..e56e4312b 100644
--- a/rest_framework/templates/rest_framework/inline/form.html
+++ b/rest_framework/templates/rest_framework/inline/form.html
@@ -1,11 +1,13 @@
 {% load rest_framework %}
+
 <form class="form-inline" role="form" action="." method="POST" novalidate>
-    {% csrf_token %}
-    {% for field in form %}
-        {% if not field.read_only %}
-            {% render_field field style=style %}
-        {% endif %}
-    {% endfor %}
-    <!-- form.non_field_errors -->
+  {% csrf_token %}
+
+  {% for field in form %}
+    {% if not field.read_only %}
+      {% render_field field style=style %}
+    {% endif %}
+  {% endfor %}
+
     <button type="submit" class="btn btn-default">Submit</button>
 </form>
diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html
index de85ba485..f28e8f11c 100644
--- a/rest_framework/templates/rest_framework/inline/input.html
+++ b/rest_framework/templates/rest_framework/inline/input.html
@@ -1,6 +1,9 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+  {% if field.label %}
+    <label class="sr-only">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/radio.html b/rest_framework/templates/rest_framework/inline/radio.html
index b65016715..efaef6c9b 100644
--- a/rest_framework/templates/rest_framework/inline/radio.html
+++ b/rest_framework/templates/rest_framework/inline/radio.html
@@ -2,23 +2,27 @@
 {% trans "None" as none_choice %}
 
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    {% if field.allow_null or field.allow_blank %}
-        <div class="radio">
-            <label>
-                <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %}>
-                {{ none_choice }}
-            </label>
-        </div>
-    {% endif %}
-    {% for key, text in field.choices.items %}
-        <div class="radio">
-            <label>
-                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        </div>
-    {% endfor %}
+  {% if field.label %}
+    <label class="sr-only">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  {% if field.allow_null or field.allow_blank %}
+    <div class="radio">
+      <label>
+        <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %}>
+        {{ none_choice }}
+      </label>
+    </div>
+  {% endif %}
+
+  {% for key, text in field.choices.items %}
+    <div class="radio">
+      <label>
+        <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+        {{ text }}
+      </label>
+    </div>
+  {% endfor %}
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html
index 6b30e4d6b..c3b2923a1 100644
--- a/rest_framework/templates/rest_framework/inline/select.html
+++ b/rest_framework/templates/rest_framework/inline/select.html
@@ -1,13 +1,17 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
+  {% if field.label %}
+    <label class="sr-only">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <select class="form-control" name="{{ field.name }}">
+    {% if field.allow_null or field.allow_blank %}
+      <option value="" {% if not field.value %}selected{% endif %}>--------</option>
     {% endif %}
-    <select class="form-control" name="{{ field.name }}">
-        {% if field.allow_null or field.allow_blank %}
-            <option value="" {% if not field.value %}selected{% endif %}>--------</option>
-        {% endif %}
-        {% for key, text in field.choices.items %}
-            <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-    </select>
+
+    {% for key, text in field.choices.items %}
+      <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+    {% endfor %}
+  </select>
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/select_multiple.html b/rest_framework/templates/rest_framework/inline/select_multiple.html
index 5a8b2494b..b9b8bb4ea 100644
--- a/rest_framework/templates/rest_framework/inline/select_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/select_multiple.html
@@ -2,14 +2,17 @@
 {% trans "No items to select." as no_items %}
 
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}">
-        {% for key, text in field.choices.items %}
-            <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
-        {% empty %}
-            <option>{{ no_items }}</option>
-        {% endfor %}
-    </select>
+  {% if field.label %}
+    <label class="sr-only">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}">
+    {% for key, text in field.choices.items %}
+      <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
+    {% empty %}
+      <option>{{ no_items }}</option>
+    {% endfor %}
+  </select>
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/textarea.html b/rest_framework/templates/rest_framework/inline/textarea.html
index 0766a01c5..bce427faa 100644
--- a/rest_framework/templates/rest_framework/inline/textarea.html
+++ b/rest_framework/templates/rest_framework/inline/textarea.html
@@ -1,6 +1,9 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    <input name="{{ field.name }}" type="text" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+  {% if field.label %}
+    <label class="sr-only">
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <input name="{{ field.name }}" type="text" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
 </div>
diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 8e6240a68..9ac80308b 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -3,66 +3,65 @@
 {% load staticfiles %}
 {% load rest_framework %}
 
-    {% block body %}
-    <body class="container">
+{% block body %}
+<body class="container">
+  <div class="container-fluid" style="margin-top: 30px">
+    <div class="row-fluid">
+      <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
+        <div class="row-fluid">
+          <div>
+            {% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %}
+          </div>
+        </div><!-- /row fluid -->
 
-        <div class="container-fluid" style="margin-top: 30px">
-            <div class="row-fluid">
-                <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
-                    <div class="row-fluid">
-                        <div>
-                            {% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %}
-                        </div>
-                    </div><!-- /row fluid -->
-        
-                    <div class="row-fluid">
-                        <div>
-                            <form action="{% url 'rest_framework:login' %}" role="form" method="post">
-                                {% csrf_token %}
-                                <div id="div_id_username"
-                                    class="clearfix control-group {% if form.username.errors %}error{% endif %}">
-                                    <div class="form-group">
-                                        <label for="id_username">Username:</label>
-                                        <input type="text" name="username" maxlength="100"
-                                            autocapitalize="off"
-                                            autocorrect="off" class="form-control textinput textInput"
-                                            id="id_username" required
-                                            {% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
-                                        {% if form.username.errors %}
-                                            <p class="text-error">
-                                                {{ form.username.errors|striptags }}
-                                            </p>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                                    <div id="div_id_password"
-                                        class="clearfix control-group {% if form.password.errors %}error{% endif %}">
-                                        <div class="form-group">
-                                        <label for="id_password">Password:</label>
-                                        <input type="password" name="password" maxlength="100"
-                                            autocapitalize="off" autocorrect="off" class="form-control textinput textInput"
-                                            id="id_password" required>
-                                        {% if form.password.errors %}
-                                            <p class="text-error">
-                                                {{ form.password.errors|striptags }}
-                                            </p>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                                <input type="hidden" name="next" value="{{ next }}" />
-                                {% if form.non_field_errors %}
-                                    {% for error in form.non_field_errors %}
-                                        <div class="well well-small text-error" style="border: none">{{ error }}</div>
-                                    {% endfor %}
-                                {% endif %}
-                                <div class="form-actions-no-box">
-                                    <input type="submit" name="submit" value="Log in" class="btn btn-primary form-control" id="submit-id-submit">
-                                </div>
-                            </form>
-                        </div>
-                    </div><!-- /.row-fluid -->
-                </div><!--/.well-->
-            </div><!-- /.row-fluid -->
-        </div><!-- /.container-fluid -->
-    </body>
-    {% endblock %}
+        <div class="row-fluid">
+          <div>
+            <form action="{% url 'rest_framework:login' %}" role="form" method="post">
+              {% csrf_token %}
+              <input type="hidden" name="next" value="{{ next }}" />
+
+              <div id="div_id_username" class="clearfix control-group {% if form.username.errors %}error{% endif %}">
+                <div class="form-group">
+                  <label for="id_username">Username:</label>
+                  <input type="text" name="username" maxlength="100"
+                      autocapitalize="off"
+                      autocorrect="off" class="form-control textinput textInput"
+                      id="id_username" required
+                      {% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
+                  {% if form.username.errors %}
+                    <p class="text-error">
+                      {{ form.username.errors|striptags }}
+                    </p>
+                  {% endif %}
+                </div>
+              </div>
+
+              <div id="div_id_password" class="clearfix control-group {% if form.password.errors %}error{% endif %}">
+                <div class="form-group">
+                  <label for="id_password">Password:</label>
+                  <input type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="form-control textinput textInput" id="id_password" required>
+                  {% if form.password.errors %}
+                    <p class="text-error">
+                      {{ form.password.errors|striptags }}
+                    </p>
+                  {% endif %}
+                </div>
+              </div>
+
+              {% if form.non_field_errors %}
+                {% for error in form.non_field_errors %}
+                  <div class="well well-small text-error" style="border: none">{{ error }}</div>
+                {% endfor %}
+              {% endif %}
+
+              <div class="form-actions-no-box">
+                <input type="submit" name="submit" value="Log in" class="btn btn-primary form-control" id="submit-id-submit">
+              </div>
+            </form>
+          </div>
+        </div><!-- /.row-fluid -->
+      </div><!--/.well-->
+    </div><!-- /.row-fluid -->
+  </div><!-- /.container-fluid -->
+</body>
+{% endblock %}
diff --git a/rest_framework/templates/rest_framework/pagination/numbers.html b/rest_framework/templates/rest_framework/pagination/numbers.html
index 040458104..4ff9385f6 100644
--- a/rest_framework/templates/rest_framework/pagination/numbers.html
+++ b/rest_framework/templates/rest_framework/pagination/numbers.html
@@ -1,27 +1,47 @@
 <ul class="pagination" style="margin: 5px 0 10px 0">
-    {% if previous_url %}
-        <li><a href="{{ previous_url }}" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
-    {% else %}
-        <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
-    {% endif %}
+  {% if previous_url %}
+    <li>
+      <a href="{{ previous_url }}" aria-label="Previous">
+        <span aria-hidden="true">&laquo;</span>
+      </a>
+    </li>
+  {% else %}
+    <li class="disabled">
+      <a href="#" aria-label="Previous">
+        <span aria-hidden="true">&laquo;</span>
+      </a>
+    </li>
+  {% endif %}
 
-    {% for page_link in page_links %}
-        {% if page_link.is_break %}
-            <li class="disabled">
-                <a href="#"><span aria-hidden="true">&hellip;</span></a>
-            </li>
-        {% else %}
-            {% if page_link.is_active %}
-                <li class="active"><a href="{{ page_link.url }}">{{ page_link.number }}</a></li>
-            {% else %}
-                <li><a href="{{ page_link.url }}">{{ page_link.number }}</a></li>
-            {% endif %}
-        {% endif %}
-    {% endfor %}
-
-    {% if next_url %}
-        <li><a href="{{ next_url }}" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
+  {% for page_link in page_links %}
+    {% if page_link.is_break %}
+      <li class="disabled">
+        <a href="#"><span aria-hidden="true">&hellip;</span></a>
+      </li>
     {% else %}
-        <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
+      {% if page_link.is_active %}
+        <li class="active">
+          <a href="{{ page_link.url }}">{{ page_link.number }}</a>
+        </li>
+      {% else %}
+        <li>
+          <a href="{{ page_link.url }}">{{ page_link.number }}</a>
+        </li>
+      {% endif %}
     {% endif %}
+  {% endfor %}
+
+  {% if next_url %}
+    <li>
+      <a href="{{ next_url }}" aria-label="Next">
+        <span aria-hidden="true">&raquo;</span>
+      </a>
+    </li>
+  {% else %}
+    <li class="disabled">
+      <a href="#" aria-label="Next">
+        <span aria-hidden="true">&raquo;</span>
+      </a>
+    </li>
+  {% endif %}
 </ul>
diff --git a/rest_framework/templates/rest_framework/pagination/previous_and_next.html b/rest_framework/templates/rest_framework/pagination/previous_and_next.html
index 08c177098..5563c4b67 100644
--- a/rest_framework/templates/rest_framework/pagination/previous_and_next.html
+++ b/rest_framework/templates/rest_framework/pagination/previous_and_next.html
@@ -1,12 +1,21 @@
 <ul class="pager">
-{% if previous_url %}
-    <li class="previous"><a href="{{ previous_url }}">&laquo; Previous</a></li>
-{% else %}
-    <li class="previous disabled"><a href="#">&laquo; Previous</a></li>
-{% endif %}
-{% if next_url %}
-    <li class="next"><a href="{{ next_url }}">Next &raquo;</a></li>
-{% else %}
-    <li class="next disabled"><a href="#">Next &raquo;</a></li>
-{% endif %}
+  {% if previous_url %}
+    <li class="previous">
+      <a href="{{ previous_url }}">&laquo; Previous</a>
+    </li>
+  {% else %}
+    <li class="previous disabled">
+      <a href="#">&laquo; Previous</a>
+    </li>
+  {% endif %}
+
+  {% if next_url %}
+    <li class="next">
+      <a href="{{ next_url }}">Next &raquo;</a>
+    </li>
+  {% else %}
+    <li class="next disabled">
+      <a href="#">Next &raquo;</a>
+    </li>
+  {% endif %}
 </ul>
diff --git a/rest_framework/templates/rest_framework/raw_data_form.html b/rest_framework/templates/rest_framework/raw_data_form.html
index b4c9f1a11..2aa0beecd 100644
--- a/rest_framework/templates/rest_framework/raw_data_form.html
+++ b/rest_framework/templates/rest_framework/raw_data_form.html
@@ -2,11 +2,11 @@
 {% csrf_token %}
 {{ form.non_field_errors }}
 {% for field in form %}
-    <div class="form-group">
-        {{ field.label_tag|add_class:"col-sm-2 control-label" }}
-        <div class="col-sm-10">
-            {{ field|add_class:"form-control" }}
-            <span class="help-block">{{ field.help_text }}</span>
-        </div>
+  <div class="form-group">
+    {{ field.label_tag|add_class:"col-sm-2 control-label" }}
+    <div class="col-sm-10">
+      {{ field|add_class:"form-control" }}
+      <span class="help-block">{{ field.help_text }}</span>
     </div>
+  </div>
 {% endfor %}
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox.html b/rest_framework/templates/rest_framework/vertical/checkbox.html
index e21a8e902..69f19dfb3 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox.html
@@ -1,14 +1,18 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    <div class="checkbox">
-        <label>
-            <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}>
-            {% if field.label %}{{ field.label }}{% endif %}
-        </label>
-    </div>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
\ No newline at end of file
+  <div class="checkbox">
+    <label>
+      <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}>
+        {% if field.label %}{{ field.label }}{% endif %}
+    </label>
+  </div>
+
+  {% if field.errors %}
+    {% for error in field.errors %}
+      <span class="help-block">{{ error }}</span>
+    {% endfor %}
+  {% endif %}
+
+  {% if field.help_text %}
+    <span class="help-block">{{ field.help_text }}</span>
+  {% endif %}
+</div>
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
index 134cca661..a3a3a08ae 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
@@ -1,30 +1,35 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    {% if style.inline %}
-        <div>
-        {% for key, text in field.choices.items %}
-            <label class="checkbox-inline">
-                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        {% endfor %}
-        </div>
-    {% else %}
-        {% for key, text in field.choices.items %}
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        </div>
-        {% endfor %}
-    {% endif %}
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
+  {% if field.label %}
+    <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+  {% endif %}
+
+  {% if style.inline %}
+    <div>
+      {% for key, text in field.choices.items %}
+        <label class="checkbox-inline">
+          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+            {{ text }}
+        </label>
+      {% endfor %}
+    </div>
+  {% else %}
+    {% for key, text in field.choices.items %}
+      <div class="checkbox">
+        <label>
+          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+          {{ text }}
+        </label>
+      </div>
+    {% endfor %}
+  {% endif %}
+
+  {% if field.errors %}
+    {% for error in field.errors %}
+      <span class="help-block">{{ error }}</span>
+    {% endfor %}
+  {% endif %}
+
+  {% if field.help_text %}
+    <span class="help-block">{{ field.help_text }}</span>
+  {% endif %}
 </div>
diff --git a/rest_framework/templates/rest_framework/vertical/fieldset.html b/rest_framework/templates/rest_framework/vertical/fieldset.html
index 3eb5191c7..4ec2a5d48 100644
--- a/rest_framework/templates/rest_framework/vertical/fieldset.html
+++ b/rest_framework/templates/rest_framework/vertical/fieldset.html
@@ -1,9 +1,15 @@
 {% load rest_framework %}
+
 <fieldset>
-    {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
-    {% for nested_field in field %}
-        {% if not nested_field.read_only %}
-            {% render_field nested_field style=style %}
-        {% endif %}
-    {% endfor %}
+  {% if field.label %}
+    <legend {% if style.hide_label %}class="sr-only"{% endif %}>
+      {{ field.label }}
+    </legend>
+  {% endif %}
+
+  {% for nested_field in field %}
+    {% if not nested_field.read_only %}
+      {% render_field nested_field style=style %}
+    {% endif %}
+  {% endfor %}
 </fieldset>
diff --git a/rest_framework/templates/rest_framework/vertical/form.html b/rest_framework/templates/rest_framework/vertical/form.html
index e68835c0e..bd57ca19a 100644
--- a/rest_framework/templates/rest_framework/vertical/form.html
+++ b/rest_framework/templates/rest_framework/vertical/form.html
@@ -1,11 +1,12 @@
 {% load rest_framework %}
+
 <form role="form" action="." method="POST" novalidate>
-    {% csrf_token %}
-    {% for field in form %}
-        {% if not field.read_only %}
-            {% render_field field style=style %}
-        {% endif %}
-    {% endfor %}
-    <!-- form.non_field_errors -->
-    <button type="submit" class="btn btn-default">Submit</button>
+  {% csrf_token %}
+  {% for field in form %}
+    {% if not field.read_only %}
+      {% render_field field style=style %}
+    {% endif %}
+  {% endfor %}
+
+  <button type="submit" class="btn btn-default">Submit</button>
 </form>
diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html
index 43cccd3ea..71e132fe9 100644
--- a/rest_framework/templates/rest_framework/vertical/input.html
+++ b/rest_framework/templates/rest_framework/vertical/input.html
@@ -1,12 +1,17 @@
-<div class="form-group  {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+  {% if field.label %}
+    <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+  {% endif %}
+
+  <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+
+  {% if field.errors %}
+    {% for error in field.errors %}
+      <span class="help-block">{{ error }}</span>
+    {% endfor %}
+  {% endif %}
+
+  {% if field.help_text %}
+    <span class="help-block">{{ field.help_text }}</span>
+  {% endif %}
 </div>
diff --git a/rest_framework/templates/rest_framework/vertical/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/list_fieldset.html
index 82d7b5f41..f2b615fe1 100644
--- a/rest_framework/templates/rest_framework/vertical/list_fieldset.html
+++ b/rest_framework/templates/rest_framework/vertical/list_fieldset.html
@@ -1,4 +1,9 @@
 <fieldset>
-    {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
-    <p>Lists are not currently supported in HTML input.</p>
+  {% if field.label %}
+    <legend {% if style.hide_label %}class="sr-only"{% endif %}>
+      {{ field.label }}
+    </legend>
+  {% endif %}
+
+  <p>Lists are not currently supported in HTML input.</p>
 </fieldset>
diff --git a/rest_framework/templates/rest_framework/vertical/radio.html b/rest_framework/templates/rest_framework/vertical/radio.html
index dea03e54e..bfee4e92d 100644
--- a/rest_framework/templates/rest_framework/vertical/radio.html
+++ b/rest_framework/templates/rest_framework/vertical/radio.html
@@ -2,46 +2,55 @@
 {% trans "None" as none_choice %}
 
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
+  {% if field.label %}
+    <label {% if style.hide_label %}class="sr-only"{% endif %}>
+      {{ field.label }}
+    </label>
+  {% endif %}
+
     {% if style.inline %}
-        <div>
+      <div>
         {% if field.allow_null or field.allow_blank %}
-            <label class="radio-inline">
-                <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
-                {{ none_choice }}
-            </label>
+          <label class="radio-inline">
+            <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+            {{ none_choice }}
+          </label>
         {% endif %}
+
         {% for key, text in field.choices.items %}
-            <label class="radio-inline">
-                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
+          <label class="radio-inline">
+            <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+            {{ text }}
+          </label>
         {% endfor %}
-        </div>
+      </div>
     {% else %}
-        {% if field.allow_null or field.allow_blank %}
-            <div class="radio">
-                <label>
-                    <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
-                    {{ none_choice }}
-                </label>
-            </div>
-        {% endif %}
-        {% for key, text in field.choices.items %}
-            <div class="radio">
-                <label>
-                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                    {{ text }}
-                </label>
-            </div>
-        {% endfor %}
+      {% if field.allow_null or field.allow_blank %}
+        <div class="radio">
+          <label>
+            <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+            {{ none_choice }}
+          </label>
+        </div>
+      {% endif %}
+
+      {% for key, text in field.choices.items %}
+        <div class="radio">
+          <label>
+            <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+            {{ text }}
+          </label>
+        </div>
+      {% endfor %}
     {% endif %}
+
     {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
     {% endif %}
+
     {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
+      <span class="help-block">{{ field.help_text }}</span>
     {% endif %}
 </div>
diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html
index 1d1109f6e..dc32d39dd 100644
--- a/rest_framework/templates/rest_framework/vertical/select.html
+++ b/rest_framework/templates/rest_framework/vertical/select.html
@@ -1,19 +1,27 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <select class="form-control" name="{{ field.name }}">
-        {% if field.allow_null or field.allow_blank %}
-            <option value="" {% if not field.value %}selected{% endif %}>--------</option>
-        {% endif %}
-        {% for key, text in field.choices.items %}
-            <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-    </select>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
+  {% if field.label %}
+    <label {% if style.hide_label %}class="sr-only"{% endif %}>
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <select class="form-control" name="{{ field.name }}">
+    {% if field.allow_null or field.allow_blank %}
+      <option value="" {% if not field.value %}selected{% endif %}>--------</option>
     {% endif %}
+
+    {% for key, text in field.choices.items %}
+      <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+    {% endfor %}
+  </select>
+
+  {% if field.errors %}
+    {% for error in field.errors %}
+      <span class="help-block">{{ error }}</span>
+    {% endfor %}
+  {% endif %}
+
+  {% if field.help_text %}
+    <span class="help-block">{{ field.help_text }}</span>
+  {% endif %}
 </div>
diff --git a/rest_framework/templates/rest_framework/vertical/select_multiple.html b/rest_framework/templates/rest_framework/vertical/select_multiple.html
index 81b25c2a3..2bb3d5ae4 100644
--- a/rest_framework/templates/rest_framework/vertical/select_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/select_multiple.html
@@ -2,20 +2,25 @@
 {% trans "No items to select." as no_items %}
 
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}">
-        {% for key, text in field.choices.items %}
-            <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
-        {% empty %}
-            <option>{{ no_items }}</option>
-        {% endfor %}
-    </select>
+  {% if field.label %}
+    <label {% if style.hide_label %}class="sr-only"{% endif %}>
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}">
+    {% for key, text in field.choices.items %}
+      <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
+    {% empty %}
+        <option>{{ no_items }}</option>
+    {% endfor %}
+  </select>
+
     {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+      {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
     {% endif %}
+
     {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
+      <span class="help-block">{{ field.help_text }}</span>
     {% endif %}
 </div>
diff --git a/rest_framework/templates/rest_framework/vertical/textarea.html b/rest_framework/templates/rest_framework/vertical/textarea.html
index 840ea853c..93a27f921 100644
--- a/rest_framework/templates/rest_framework/vertical/textarea.html
+++ b/rest_framework/templates/rest_framework/vertical/textarea.html
@@ -1,12 +1,17 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
+  {% if field.label %}
+    <label {% if style.hide_label %}class="sr-only"{% endif %}>
+      {{ field.label }}
+    </label>
+  {% endif %}
+
+  <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
+
+  {% if field.errors %}
+    {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+  {% endif %}
+
+  {% if field.help_text %}
+    <span class="help-block">{{ field.help_text }}</span>
+  {% endif %}
 </div>
