diff --git a/freepost/static/stylus/freepost.styl b/freepost/static/stylus/freepost.styl
index 0d9bf7a..31112d6 100755
--- a/freepost/static/stylus/freepost.styl
+++ b/freepost/static/stylus/freepost.styl
@@ -78,7 +78,7 @@ body
                     border          0
                     border-bottom   1px solid #ccc
                     color           #000
-                    margin          0 0
+                    margin          0
                     padding         0 .5rem .5rem .5rem
                 
                 /* Highlight menu item of the current active page (Hot/New/Submit/...) */
@@ -277,14 +277,12 @@ body
             
             /* Login page */
             > .login
-                margin      auto
-                max-width   20em
+                @media screen and (min-width: 1024px)
+                    margin      auto
+                    max-width   40%
                 
-                input[type=submit]
-                    margin 1em 0
-                
-                .title
-                    line-height 2em
+                > form > div
+                    margin 1rem 0
             
             /* Page to edit a post or a comment */
             > .edit
diff --git a/freepost/templates/login.html b/freepost/templates/login.html
index 19fcb2d..905f0a2 100755
--- a/freepost/templates/login.html
+++ b/freepost/templates/login.html
@@ -15,18 +15,12 @@
         <h3>Log in</h3>
 
         <form action="" method="post">
-            <div class="title">
-                Screen name
-            </div>
             <div>
-                <input type="text" name="username" class="form-control" required />
-            </div>
-
-            <div class="title">
-                Password
+                <input type="text" name="username" placeholder="Username" class="form-control" required />
             </div>
+            
             <div>
-                <input type="password" name="password" class="form-control" required />
+                <input type="password" name="password" placeholder="Password" class="form-control" required />
             </div>
 
             <div>