diff --git a/web/public/favicon.ico b/web/public/favicon.ico
index 546b64d..246f13b 100644
Binary files a/web/public/favicon.ico and b/web/public/favicon.ico differ
diff --git a/web/public/stylesheets/mw.css b/web/public/stylesheets/mw.css
index 717888a..77f011b 100644
--- a/web/public/stylesheets/mw.css
+++ b/web/public/stylesheets/mw.css
@@ -31,7 +31,7 @@ a:hover{text-decoration:underline}
 #narrow {width:600px;margin-top:50px;box-shadow:0 1px 7px #aaa;border-color:#bbb;border-radius:5px;}
 #narrow h3{padding:10px 30px;margin:0;}
 #narrow div.error{padding:5px 30px;color:#f44;}
-#narrow form > div {padding:15px 30px;}
+#narrow form > div {padding:5px 30px;}
 #narrow div.buttons {position:relative;background:#eee;padding:15px 30px;border-top:1px solid #bbb;border-bottom-left-radius:5px;border-bottom-right-radius:5px;}
 
 form div.item{position:relative;margin-bottom:25px;}
diff --git a/web/views/login.jade b/web/views/login.jade
index 0d0b1d8..ce2e042 100644
--- a/web/views/login.jade
+++ b/web/views/login.jade
@@ -4,7 +4,11 @@ include mixins/form-helpers
     
   form(method='post', action='/')
     div
-      mixin field('username', 'text')
-      mixin field('password', 'password')
+    .item
+      label(for='username') username
+      input(name='username', type='text')
+    .item
+      label(for='password') password
+      input(name='password', type='password')
     .buttons
       input.button(type='submit', value='login')
\ No newline at end of file
diff --git a/web/views/mixins/form-helpers.jade b/web/views/mixins/form-helpers.jade
deleted file mode 100644
index 04c5b42..0000000
--- a/web/views/mixins/form-helpers.jade
+++ /dev/null
@@ -1,8 +0,0 @@
-mixin field(name, type, field)
-  - var field = field || name;
-  - var value = type != 'password' && typeof(params) != 'undefined' ?  params[field] : ''
-  .item
-    label(for=field)=field
-    input(name=field, type=type, value=value)
-    - if (typeof(validation_errors) != 'undefined' && validation_errors[field])
-      label.error=validation_errors[field]
\ No newline at end of file