diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 9ae0a31..df982ca 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -15,7 +15,7 @@
                     <li>
                         <a href=@{ProfileR}>
                             <span .user-handle>
-                            #{userHandle user}
+                                #{userHandle user}
                     <li>
                         <a href=@{AuthR LogoutR}>Logout
                 $nothing
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index a05018b..ab58c7d 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -1,16 +1,47 @@
-.navbar .nav > li > a  {
-  color: #0088cc
+.navbar {
+  .brand {
+    color: #0088cc;
+    padding-left: 0;
+  }
+  .nav > li > a {
+    color: #0088cc;
+  }
+  .navbar-inner {
+    box-shadow: none;
+    border: 0;
+    background: inherit;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+  .user-handle {
+    max-width: 15em;
+    overflow: hidden;
+    white-space: nowrap;
+    display: inline-block;
+    text-overflow: ellipsis;
+  }
 }
-.navbar .navbar-inner {
-  border: 0;
-  background: inherit;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+
+@media (max-width: 979px) {
+  .navbar-inner {
+    padding-left: 0;
+  }
 }
-.navbar .user-handle {
-  max-width: 15em;
-  overflow: hidden;
-  white-space: nowrap;
-  display: inline-block;
-  text-overflow:ellipsis;
+
+@media (max-width: 767px) {
+  .navbar .nav.pull-right {
+    float: none;
+    display: block;
+    clear: left;
+    margin-left: -15px;
+  }
+}
+
+@media (max-width: 480px){
+  .navbar .brand + .nav {
+    float: none;
+    display: block;
+    clear: left;
+    margin-left: -15px;
+  }
 }
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index ad29c5e..fad2a12 100644
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -1,44 +1,46 @@
 <div .container>
-    <h2>Email addresses
-    $if length emails <= 1
-        $forall Entity _ email <- emails
-            <p>#{emailEmail email}
-    $else
-        <ul>
-            $forall Entity eid email <- emails
-                <li .email>
-                    #{emailEmail email}
-                    <form method=post action=@{EmailR eid}?_method=DELETE>
-                        <button .btn>Remove
+    <div .row>
+        <div .span12>
+            <h2>Email addresses
+            $if length emails <= 1
+                $forall Entity _ email <- emails
+                    <p>#{emailEmail email}
+            $else
+                <ul>
+                    $forall Entity eid email <- emails
+                        <li .email>
+                            #{emailEmail email}
+                            <form method=post action=@{EmailR eid}?_method=DELETE>
+                                <button .btn>Remove
 
-    <p>
-        <a href=@{AuthR LoginR}>Add another email address.
+            <p>
+                <a href=@{AuthR LoginR}>Add another email address.
 
-    <h2>Profile
+            <h2>Profile
 
-    <form method=post action=@{ProfileR}?_method=PUT enctype=#{enctype} role=form>
-        <div .form-group>
-            ^{userWidget}
-        <button .btn>Update
+            <form method=post action=@{ProfileR}?_method=PUT enctype=#{enctype} role=form>
+                <div .form-group>
+                    ^{userWidget}
+                <button .btn>Update
 
-    <h2>Aliases
+            <h2>Aliases
 
-    <form method=post action=@{AliasesR}?_method=PUT>
-        Format: alias name, package set ID
-        <textarea #aliases name=aliases>#{unlines $ map aliasToText aliases}
-        <button .btn>Update
+            <form method=post action=@{AliasesR}?_method=PUT>
+                Format: alias name, package set ID
+                <textarea #aliases name=aliases>#{unlines $ map aliasToText aliases}
+                <button .btn>Update
 
-    $if not $ null aliases
-        <dl>
-            $forall Entity _ alias <- aliases
-                <dt>#{aliasName alias}
-                <dd>
-                    $with url <- AliasR (userHandle user) (aliasName alias) []
-                        <a href=@{url}>@{url}
+            $if not $ null aliases
+                <dl>
+                    $forall Entity _ alias <- aliases
+                        <dt>#{aliasName alias}
+                        <dd>
+                            $with url <- AliasR (userHandle user) (aliasName alias) []
+                                <a href=@{url}>@{url}
 
-    <h2>Security token
+            <h2>Security token
 
-    <p>
-        Your security token is #{userToken user}.
-        <form method=post action=@{ResetTokenR}>
-            <button>Reset token
+            <p>
+                Your security token is #{userToken user}.
+                <form method=post action=@{ResetTokenR}>
+                    <button>Reset token