diff --git a/templates/_helpers.html b/templates/_helpers.html
index f2b2214..a45de02 100644
--- a/templates/_helpers.html
+++ b/templates/_helpers.html
@@ -1,3 +1,7 @@
 {% macro render_field(field) %}
-<div class="form-group {% if field.errors %}has-error{% endif %}">{{ field.label(class_="control-label col-sm-2") }}<div class="col-sm-4">{{ field(class_="form-control") }}</div>{% for error in field.errors %}[ {{ error }} ]{% endfor %}</div>
+<div class="form-group {% if field.errors %}has-error{% endif %}">{{ field.label(class_="control-label col-sm-3") }}<div class="col-sm-5">{{ field(class_="form-control") }}</div>{% for error in field.errors %}[ {{ error }} ]{% endfor %}</div>
+{%- endmacro %}
+
+{% macro render_button(button) %}
+<div class="form-group"><div class="col-sm-offset-3 col-sm-5">{{ button(class_="btn btn-primary") }}</div></div>
 {%- endmacro %}
diff --git a/templates/create.html b/templates/create.html
index 0c26d78..7b1ac6a 100644
--- a/templates/create.html
+++ b/templates/create.html
@@ -1,4 +1,4 @@
-{% from "_helpers.html" import render_field %}
+{% from "_helpers.html" import render_button, render_field %}
 {% extends "_base.html" %}
 {% block content %}
       <div class="page-header">
@@ -12,6 +12,6 @@
         {{ render_field(form.gn) }}
         {{ render_field(form.pwd1) }}
         {{ render_field(form.pwd2) }}
-        <div class="form-group"><div class="col-sm-offset-2 col-sm-10">{{ form.submit(class_="btn btn-primary") }}</div></div>
+        {{ render_button(form.submit) }}
       </form>
 {% endblock %}
diff --git a/templates/edit.html b/templates/edit.html
index e7a1084..5a60a25 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -1,4 +1,4 @@
-{% from "_helpers.html" import render_field %}
+{% from "_helpers.html" import render_button, render_field %}
 {% extends "_base.html" %}
 {% block content %}
       <div class="page-header">
@@ -9,6 +9,6 @@
         {{ render_field(form.user) }}
         {{ render_field(form.pwd1) }}
         {{ render_field(form.pwd2) }}
-        <div class="form-group"><div class="col-sm-offset-2 col-sm-10">{{ form.submit(class_="btn btn-primary") }}</div></div>
+        {{ render_button(form.submit) }}
       </form>
 {% endblock %}
diff --git a/templates/login.html b/templates/login.html
index 18bf07b..5324f73 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,4 +1,4 @@
-{% from "_helpers.html" import render_field %}
+{% from "_helpers.html" import render_button, render_field %}
 {% extends "_base.html" %}
 {% block content %}
       <div class="page-header">
@@ -8,6 +8,6 @@
         {{ form.hidden_tag() }}
         {{ render_field(form.user) }}
         {{ render_field(form.pswd) }}
-        <div class="form-group"><div class="col-sm-offset-2 col-sm-10">{{ form.submit(class_="btn btn-primary") }}</div></div>
+        {{ render_button(form.submit) }}
       </form>
 {% endblock %}