diff --git a/TODO b/TODO
index d3a9501..5380931 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,6 @@ TODO:
 * Need an admin contact in footer
 * Show recipes from non-software/base layers differently in recipes list
 * Submit layer form fixes:
- * Layout for maintainers (js collapse?)
  * Captcha
 
 Later:
diff --git a/layerindex/editlayer.html b/layerindex/editlayer.html
index b0e717b..1653b0b 100644
--- a/layerindex/editlayer.html
+++ b/layerindex/editlayer.html
@@ -17,84 +17,119 @@
 {% block content %}
 {% autoescape on %}
 
+<div class="container-fluid">
+    <div class="row-fluid">
+        {% block heading %}
+        <div class="page-header">
+            <h1>Edit layer</h1>
+        </div>
+        {% endblock %}
+
 {% block formtag %}
 {% if form.was_saved %}
     <div class="alert alert-success">
         Changes saved successfully.
     </div>
 {% endif %}
-<form action="{% url edit_layer form.instance.name %}" method="post">
+<form id="edit_layer_form" action="{% url edit_layer form.instance.name %}" method="post">
 {% endblock %}
 {% csrf_token %}
     {% for hidden in form.hidden_fields %}
         {{ hidden }}
     {% endfor %}
 
-    {% for field in form.visible_fields %}
-        <div class="fieldWrapper">
+    <div class="formfields">
+        {% for field in form.visible_fields %}
+            {% if field.errors %}
+            <div class="control-group alert alert-error">
             {{ field.errors }}
-            {{ field.label_tag }}
-            {% if field.name = 'deps' %}
-                <div class="scrolling">
-                    <table><tbody>
-                        {% for deplayer in deplistlayers %}
-                            {% if deplayer.id in form.checked_deps %}
-                                <tr>
-                                    <td><input type="checkbox" name="deps" value="{{ deplayer.id }}" id="id_deps_{{forloop.counter}}" checked="checked" /></td>
-                                    {% if deplayer.status = 'N' %}
-                                    <td><label class="muted" for="id_deps_{{forloop.counter}}">{{ deplayer.name }} (unpublished)</label></td>
-                                    {% else %}
-                                    <td><label for="id_deps_{{forloop.counter}}">{{ deplayer.name }}</label></td>
-                                    {% endif %}
-                                </tr>
-                            {% endif %}
-                        {% endfor %}
-                        {% for deplayer in deplistlayers %}
-                            {% if not deplayer.id in form.checked_deps %}
-                                <tr>
-                                    <td><input type="checkbox" name="deps" value="{{ deplayer.id }}" id="id_deps_{{forloop.counter}}" /></td>
-                                    {% if deplayer.status = 'N' %}
-                                    <td><label class="muted" for="id_deps_{{forloop.counter}}">{{ deplayer.name }} (unpublished)</label></td>
-                                    {% else %}
-                                    <td><label for="id_deps_{{forloop.counter}}">{{ deplayer.name }}</label></td>
-                                    {% endif %}
-                                </tr>
-                            {% endif %}
-                        {% endfor %}
-                    </tbody></table>
-                </div>
             {% else %}
-                {{ field }}
+            <div class="control-group">
             {% endif %}
-            {{ field.help_text }}
-        </div>
-    {% endfor %}
-    <h3>Maintainers</h3>
+                <div class="control-label">
+                    {{ field.label_tag }}
+                </div>
+                <div class="controls">
+                    {% if field.name = 'deps' %}
+                        <div class="scrolling">
+                            <table><tbody>
+                                {% for deplayer in deplistlayers %}
+                                    {% if deplayer.id in form.checked_deps %}
+                                        <tr>
+                                            <td><input type="checkbox" name="deps" value="{{ deplayer.id }}" id="id_deps_{{forloop.counter}}" checked="checked" /></td>
+                                            {% if deplayer.status = 'N' %}
+                                            <td><label class="muted" for="id_deps_{{forloop.counter}}">{{ deplayer.name }} (unpublished)</label></td>
+                                            {% else %}
+                                            <td><label for="id_deps_{{forloop.counter}}">{{ deplayer.name }}</label></td>
+                                            {% endif %}
+                                        </tr>
+                                    {% endif %}
+                                {% endfor %}
+                                {% for deplayer in deplistlayers %}
+                                    {% if not deplayer.id in form.checked_deps %}
+                                        <tr>
+                                            <td><input type="checkbox" name="deps" value="{{ deplayer.id }}" id="id_deps_{{forloop.counter}}" /></td>
+                                            {% if deplayer.status = 'N' %}
+                                            <td><label class="muted" for="id_deps_{{forloop.counter}}">{{ deplayer.name }} (unpublished)</label></td>
+                                            {% else %}
+                                            <td><label for="id_deps_{{forloop.counter}}">{{ deplayer.name }}</label></td>
+                                            {% endif %}
+                                        </tr>
+                                    {% endif %}
+                                {% endfor %}
+                            </tbody></table>
+                        </div>
+                    {% else %}
+                        {{ field }}
+                    {% endif %}
+                    <span class="help-inline custom-help">
+                        {{ field.help_text }}
+                    </span>
+                </div>
+            </div>
+        {% endfor %}
+    </div>
+    <h3 id="maintainers">Maintainers</h3>
     {{ maintainerformset.non_form_errors }}
     {{ maintainerformset.management_form }}
     {% for maintainerform in maintainerformset %}
         <div class="maintainerform" id="maintainerform-{{forloop.counter0}}">
-        <h4>Maintainer {{forloop.counter}}</h4>
-        {% for hidden in maintainerform.hidden_fields %}
-            {{ hidden }}
-        {% endfor %}
+            <h4>Maintainer {{forloop.counter}}</h4>
+            <div class="maintainerformfields">
+                {% for hidden in maintainerform.hidden_fields %}
+                    {{ hidden }}
+                {% endfor %}
 
-        {% for field in maintainerform.visible_fields %}
-            <div class="fieldWrapper">
-                {{ field.errors }}
-                {{ field.label_tag }}
-                {{ field }}
-                {{ field.help_text }}
+                {% for field in maintainerform.visible_fields %}
+                    {% if field.errors %}
+                    <div class="control-group alert alert-error">
+                    {{ field.errors }}
+                    {% else %}
+                    <div class="control-group">
+                    {% endif %}
+                        <div class="control-label">
+                            {{ field.label_tag }}
+                        </div>
+                        {{ field }}
+                        <span class="help-inline custom-help">
+                            {{ field.help_text }}
+                        </span>
+                    </div>
+                {% endfor %}
             </div>
-        {% endfor %}
         </div>
     {% endfor %}
-    <p><a href="#" class="btn" id="addanothermaintainer">Add another maintainer</a><p>
+    <p><a href="#" class="btn btn-small" id="addanothermaintainer"><i class="icon-plus"></i>Add maintainer</a><p>
+<div class="submitbuttons">
 {% block submitbuttons %}
-<input type="submit" value="Save" class="btn btn-primary" />
+<input type="submit" value="Save layer" class="btn btn-primary btn-large" />
 {% endblock %}
+</div>
 </form>
 
+    </div>
+</div>
+
 {% endautoescape %}
 
 {% endblock %}
diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css
index b4d5f3f..d5abfe8 100644
--- a/layerindex/static/css/additional.css
+++ b/layerindex/static/css/additional.css
@@ -59,9 +59,60 @@ h1 .btn {
 height: auto;
 max-height: 120px;
 overflow: auto;
+width: 40.1709%;
+border: 1px solid #DDDDDD;
+padding: 8px;
+}
+
+.scrolling td {
+    padding: 4px;
+}
+
+.scrolling checkbox, label {
+    margin: 0px;
+}
+
+.formfields input {
+    width: 50%;
+}
+
+.formfields textarea {
+    width: 50%;
+}
+
+#maintainers {
+    padding-top: 0.75em;
+}
+
+.maintainerform {
+    /* Fix slight jumping at end of expand in Firefox */
+    padding-top: 1px;
+}
+
+.maintainerformfields input {
+    width: 25em;
+}
+
+.custom-help {
+    margin-left: 10px;
+    max-width: 40%;
+    color: #999;
+    vertical-align:top;
+}
+
+.errorlist {
+    color: #b94a48;
+    list-style-type: none;
+    margin-left: 0px;
 }
 
 .copyable {
     padding-left: 5px;
     padding-right: 3px;
 }
+
+.submitbuttons {
+    margin-top: 2em;
+    padding-top: 1em;
+    border-top: 1px solid rgb(238, 238, 238);
+}
diff --git a/layerindex/submitlayer.html b/layerindex/submitlayer.html
index c4d7e0d..f83375d 100644
--- a/layerindex/submitlayer.html
+++ b/layerindex/submitlayer.html
@@ -14,16 +14,22 @@
 {% block title %}OpenEmbedded metadata index - submit layer{% endblock %}
 -->
 
+        {% block heading %}
+        <div class="page-header">
+            <h1>Submit layer</h1>
+        </div>
+        {% endblock %}
+
+
 {% block submitlink %}
 <!-- Disable submit link, otherwise clicking it will blank the form! -->
 <li><a href="#">Submit layer</a></li>
 {% endblock %}
 
-
 {% block formtag %}
-<form action="{% url submit_layer %}" method="post">
+<form id="edit_layer_form" action="{% url submit_layer %}" method="post">
 {% endblock %}
 
 {% block submitbuttons %}
-<input type="submit" value="Submit" class="btn btn-primary" />
+<input type="submit" value="Submit layer" class="btn btn-primary btn-large" />
 {% endblock %}