diff --git a/.travis.yml b/.travis.yml
index 79efb4a..bfd7f70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,17 +10,16 @@ env:
 
 install:
   - if [[ $DJANGO == '1.6' ]]; then pip install django==1.6; fi
-  - if [[ $DJANGO == '1.7' ]]; then pip install -e git+git://github.com/django/django.git@1.7c2#egg=django1.7rc2; fi
+  - if [[ $DJANGO != '1.6' ]]; then pip install -e git+git://github.com/django/django.git@1.7c2#egg=django1.7rc2; fi
   - pip install django-markdown
   - pip install django-colorful
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install git+git://github.com/bouttier/django-crispy-forms@master; fi
-  - if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then pip install django-crispy-forms; fi
+  - pip install git+git://github.com/bouttier/django-forms-bootstrap.git@master
   - pip install django-bootstrap3-datetimepicker
-  - pip install coveralls
+  - if [[ $DJANGO == '1.6' ]]; then pip install coveralls; fi
 
 script:
   - if [[ $DJANGO == '1.6' ]]; then coverage run --branch --source=issue --omit=issue/migrations/*.py manage.py test; fi
-  - if [[ $DJANGO == '1.7' ]]; then python manage.py test; fi
+  - if [[ $DJANGO != '1.6' ]]; then python manage.py test; fi
 
 after_success:
   if [[ $DJANGO == '1.6' ]]; then coveralls; fi
diff --git a/issue/templates/issue/global_permission_edit.html b/issue/templates/issue/global_permission_edit.html
index 8c243a9..b5f8774 100644
--- a/issue/templates/issue/global_permission_edit.html
+++ b/issue/templates/issue/global_permission_edit.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block content %}
 
@@ -15,11 +15,13 @@
   </div>
 
   <div class="panel-body">
-    <form action="" method="post" role="form">
-      {{ form|crispy }}
-      {% csrf_token %}
-      <button type="submit" class="btn btn-primary">Submit</button>
-    </form>
+    <div class="col-md-offset-3 col-md-6">
+      <form action="" method="post" role="form">
+        {{ form|as_bootstrap }}
+        {% csrf_token %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+      </form>
+    </div>
   </div>
 
 </div>
diff --git a/issue/templates/issue/issue_comment.html b/issue/templates/issue/issue_comment.html
index f2330c8..a3ba96f 100644
--- a/issue/templates/issue/issue_comment.html
+++ b/issue/templates/issue/issue_comment.html
@@ -1,6 +1,6 @@
 {% extends 'issue/project.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block media %}{{ form.media }}{% endblock %}
 
@@ -9,7 +9,7 @@
 {% block content %}
 
 <form action="" method="post" role="form">
-  {{ form|crispy }}
+  {{ form|as_bootstrap }}
   {% csrf_token %}
   <button type="submit" class="btn btn-primary">Submit</button>
 </form>
diff --git a/issue/templates/issue/issue_edit.html b/issue/templates/issue/issue_edit.html
index d17e4a2..f0eb5d8 100644
--- a/issue/templates/issue/issue_edit.html
+++ b/issue/templates/issue/issue_edit.html
@@ -1,6 +1,6 @@
 {% extends 'issue/project.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block issuetab %} class="active"{% endblock %}
 
@@ -30,11 +30,13 @@
   </div>
 
   <div class="panel-body">
-    <form action="" method="post" role="form">
-      {{ form|crispy }}
-      {% csrf_token %}
-      <button type="submit" class="btn btn-primary">Submit</button>
-    </form>
+    <div class="col-md-offset-2 col-md-8">
+      <form action="" method="post" role="form">
+        {{ form|as_bootstrap }}
+        {% csrf_token %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+      </form>
+    </div>
   </div>
 
 </div>
diff --git a/issue/templates/issue/label_edit.html b/issue/templates/issue/label_edit.html
index 67da2ac..b482f79 100644
--- a/issue/templates/issue/label_edit.html
+++ b/issue/templates/issue/label_edit.html
@@ -1,6 +1,6 @@
 {% extends 'issue/project.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block labeltab %} class="active"{% endblock %}
 
@@ -24,7 +24,7 @@
   <div class="panel-body">
     <div class="col-md-offset-4 col-md-4">
       <form action="" method="post" role="form">
-        {{ form|crispy }}
+        {{ form|as_bootstrap }}
         {% csrf_token %}
         <button type="submit" class="btn btn-primary">Submit</button>
       </form>
diff --git a/issue/templates/issue/milestone_edit.html b/issue/templates/issue/milestone_edit.html
index 815c27f..0ccb0ff 100644
--- a/issue/templates/issue/milestone_edit.html
+++ b/issue/templates/issue/milestone_edit.html
@@ -1,6 +1,6 @@
 {% extends 'issue/project.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block milestonetab %} class="active"{% endblock %}
 
@@ -28,7 +28,7 @@
   <div class="panel-body">
     <div class="col-md-offset-4 col-md-4">
       <form action="" method="post" role="form">
-        {{ form|crispy }}
+        {{ form|as_bootstrap }}
         {% csrf_token %}
         <button type="submit" class="btn btn-primary">Submit</button>
       </form>
diff --git a/issue/templates/issue/project_add.html b/issue/templates/issue/project_add.html
index 47201e4..620b1c6 100644
--- a/issue/templates/issue/project_add.html
+++ b/issue/templates/issue/project_add.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block content %}
 
@@ -16,11 +16,13 @@
   </div>
 
   <div class="panel-body">
-    <form action="" method="post" role="form">
-      {{ form|crispy }}
-      {% csrf_token %}
-      <button type="submit" class="btn btn-primary">Submit</button>
-    </form>
+    <div class="col-md-offset-2 col-md-8">
+      <form action="" method="post" role="form">
+        {{ form|as_bootstrap }}
+        {% csrf_token %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+      </form>
+    </div>
   </div>
 
 </div>
diff --git a/issue/templates/issue/project_edit.html b/issue/templates/issue/project_edit.html
index aa1b0f9..285c4e6 100644
--- a/issue/templates/issue/project_edit.html
+++ b/issue/templates/issue/project_edit.html
@@ -1,6 +1,6 @@
 {% extends 'issue/project.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block content %}
 
@@ -16,11 +16,13 @@
   </div>
 
   <div class="panel-body">
-    <form action="" method="post" role="form">
-      {{ form|crispy }}
-      {% csrf_token %}
-      <button type="submit" class="btn btn-primary">Submit</button>
-    </form>
+    <div class="col-md-offset-2 col-md-8">
+      <form action="" method="post" role="form">
+        {{ form|as_bootstrap }}
+        {% csrf_token %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+      </form>
+    </div>
   </div>
 
 </div>
diff --git a/issue/templates/issue/project_permission_edit.html b/issue/templates/issue/project_permission_edit.html
index fbd58fd..e224469 100644
--- a/issue/templates/issue/project_permission_edit.html
+++ b/issue/templates/issue/project_permission_edit.html
@@ -1,6 +1,6 @@
 {% extends 'issue/project.html' %}
 
-{% load crispy_forms_tags %}
+{% load bootstrap_tags %}
 
 {% block permissiontab %} class="active"{% endblock %}
 
@@ -17,11 +17,13 @@
   </div>
 
   <div class="panel-body">
-    <form action="" method="post" role="form">
-      {{ form|crispy }}
-      {% csrf_token %}
-      <button type="submit" class="btn btn-primary">Submit</button>
-    </form>
+    <div class="col-md-offset-3 col-md-6">
+      <form action="" method="post" role="form">
+        {{ form|as_bootstrap }}
+        {% csrf_token %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+      </form>
+    </div>
   </div>
 
 </div>
diff --git a/ponytracker/settings.py b/ponytracker/settings.py
index 842333b..54011e9 100644
--- a/ponytracker/settings.py
+++ b/ponytracker/settings.py
@@ -42,7 +42,7 @@ INSTALLED_APPS = (
 
     'django_markdown',
     'bootstrap3_datetime',
-    'crispy_forms',
+    'django_forms_bootstrap',
     'colorful',
     'issue',
 )