diff --git a/deploystream/apps/users/views.py b/deploystream/apps/users/views.py
index 5853850..8e8d731 100644
--- a/deploystream/apps/users/views.py
+++ b/deploystream/apps/users/views.py
@@ -43,7 +43,11 @@ def login():
             flash('Welcome %s' % user.name)
             return redirect(url_for('users.home'))
         flash('Wrong email or password', 'error-message')
-    return render_template("users/login.html", form=form)
+    if request.method == 'POST':
+        suffix = ".html"
+    else:
+        suffix = "_ajax.html"
+    return render_template("users/login" + suffix, form=form)
 
 
 @mod.route('/register/', methods=['GET', 'POST'])
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/base.html b/deploystream/templates/base.html
index 24fe0f6..bb39707 100644
--- a/deploystream/templates/base.html
+++ b/deploystream/templates/base.html
@@ -11,6 +11,11 @@
         <link href="/static/css/responsive.css" rel="stylesheet">
         <!-- </site bootstrap> -->
 
+        <!-- Bootstrap { -->
+        <script src="http://code.jquery.com/jquery.min.js"></script>
+        <script src="/static/bootstrap/js/bootstrap.min.js"></script>
+        <!-- } -->
+
         {% block extrahead %}
         {% endblock %}
     {% endblock %}
@@ -36,10 +41,22 @@
             </div>
         </footer>
 
-        <!-- Bootstrap { -->
-        <script src="http://code.jquery.com/jquery.min.js"></script>
-        <script src="/static/bootstrap/js/bootstrap.min.js"></script>
-        <!-- } -->
+        <script>
+        $(document).ready(function () {
+            $('.signin-menu').popover({
+                html: true,
+                title: "Sign in",
+                placement: 'bottom',
+                content: function() {
+                    return $.ajax({
+                        type: "GET",
+                        url: "{{ url_for('users.login') }}",
+                        async: false
+                    }).responseText;
+                }
+            });
+        });
+        </script>
         {% block scripts %}{% endblock %}
     </body>
 
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/navbar.html b/deploystream/templates/navbar.html
index 5b625b6..f565fde 100644
--- a/deploystream/templates/navbar.html
+++ b/deploystream/templates/navbar.html
@@ -28,7 +28,9 @@
                 </ul>
                 {% else %}
                 <ul class="nav pull-right">
-                      <li><a href="/users/login">Sign In</a></li>
+                    <li>
+                        <a href="#" class="signin-menu">Sign In to your <b>ployst</b> account</a>
+                    </li>
                 </ul>
                 {% endif %}
 
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/login_ajax.html b/deploystream/templates/users/login_ajax.html
new file mode 100644
index 0000000..b347cf9
--- /dev/null
+++ b/deploystream/templates/users/login_ajax.html
@@ -0,0 +1,9 @@
+{% from "forms/macros.html" import render_field %}
+<form method="POST" action="{{ url_for('users.login') }}" class="form">
+    {{ form.csrf_token }}
+    {{ render_field(form.email, class="input text", autofocus="autofocus") }}
+    {{ render_field(form.password, class="input text") }}
+    <div class=controls>
+        <input type="submit" value="Login" class="btn btn-primary">
+    </div>
+</form>
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()