diff --git a/deploystream/static/less/bootstrap-modules.less b/deploystream/static/less/bootstrap-modules.less
index 798c5e0..8afb5bf 100644
--- a/deploystream/static/less/bootstrap-modules.less
+++ b/deploystream/static/less/bootstrap-modules.less
@@ -13,7 +13,7 @@
 // Base CSS
 @import "bootstrap/type.less";
 @import "bootstrap/code.less";
-// @import "bootstrap/forms.less";
+@import "bootstrap/forms.less";
 @import "bootstrap/tables.less";
 
 // Components: common
diff --git a/deploystream/templates/forms/macros.html b/deploystream/templates/forms/macros.html
index 5d3f1e0..af8b188 100644
--- a/deploystream/templates/forms/macros.html
+++ b/deploystream/templates/forms/macros.html
@@ -1,12 +1,14 @@
 {% macro render_field(field) %}
     <div class="form_field control-group">
-    {{ field.label(class="control-label") }}
-    {% if field.errors %}
-        {% set css_class = 'has_error ' + kwargs.pop('class', 'input-xlarge') %}
-        {{ field(class=css_class, **kwargs) }}
-        <ul class="errors">{% for error in field.errors %}<li>{{ error|e }}</li>{% endfor %}</ul>
-    {% else %}
-        {{ field(**kwargs) }}
-    {% endif %}
+        {{ field.label(class="control-label") }}
+        <div class=controls>
+        {% if field.errors %}
+            {% set css_class = 'has_error ' + kwargs.pop('class', 'input-xlarge') %}
+            {{ field(class=css_class, **kwargs) }}
+            <ul class="errors">{% for error in field.errors %}<li>{{ error|e }}</li>{% endfor %}</ul>
+        {% else %}
+            {{ field(**kwargs) }}
+        {% endif %}
+        </div>
     </div>
 {% endmacro %}
diff --git a/deploystream/templates/users/login.html b/deploystream/templates/users/login.html
index 21ee7b5..0a3dd6b 100644
--- a/deploystream/templates/users/login.html
+++ b/deploystream/templates/users/login.html
@@ -1,15 +1,21 @@
 {% extends "base.html" %}
 
 {% block content %}
+  <ul class="nav nav-tabs">
+    <li class="active">
+      <a href="#">Login</a>
+    </li>
+    <li>
+      <a href="{{ url_for('users.register') }}">Register</a>
+    </li>
+  </ul>
   {% from "forms/macros.html" import render_field %}
   <form method="POST" action="." class="form-horizontal">
-    <div id="legend">
-      <legend class="">Login</legend>
-    </div>
     {{ form.csrf_token }}
     {{ render_field(form.email, class="input text") }}
     {{ render_field(form.password, class="input text") }}
-    <input type="submit" value="Login" class="button green">
+    <div class=controls>
+        <input type="submit" value="Login" class="btn btn-primary">
+    </div>
   </form>
-  <a href="{{ url_for('users.register') }}">Register</a>
 {% endblock %}
diff --git a/deploystream/templates/users/register.html b/deploystream/templates/users/register.html
index 2be4926..c6c6ef8 100644
--- a/deploystream/templates/users/register.html
+++ b/deploystream/templates/users/register.html
@@ -1,14 +1,23 @@
 {% extends "base.html" %}
 {% block content %}
+  <ul class="nav nav-tabs">
+    <li>
+      <a href="{{ url_for('users.login') }}">Login</a>
+    </li>
+    <li class="active">
+      <a href="#">Register</a>
+    </li>
+  </ul>
   {% from "forms/macros.html" import render_field %}
-  <form method="POST" action="." class="form">
+  <form method="POST" action="." class="form-horizontal">
     {{ form.csrf_token }}
     {{ render_field(form.name, class="input text") }}
     {{ render_field(form.email, class="input text") }}
     {{ render_field(form.password, class="input text") }}
     {{ render_field(form.confirm, class="input text") }}
     {{ render_field(form.accept_tos, class="input checkbox") }}
-    <input type="submit" value="Register" class="button green">
+    <div class=controls>
+        <input type="submit" value="Register" class="btn btn-primary">
+    </div>
   </form>
-  <a href="{{ url_for('users.login') }}">Login</a>
 {% endblock %}
diff --git a/scripts/create_db.py b/scripts/create_db.py
old mode 100644
new mode 100755
index f6d7cca..93e8470
--- a/scripts/create_db.py
+++ b/scripts/create_db.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 from deploystream import db
 
 db.create_all()