diff --git a/public/style.css b/public/style.css
index 8eaabc98..df32a896 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1173,7 +1173,7 @@ img, video {
 .br1 {
   border-radius: 0.125rem; }
 
-.br2, .hmn-code {
+.br2, .hmn-code, .notice {
   border-radius: 0.25rem; }
 
 .br3 {
@@ -4711,7 +4711,7 @@ code, .code {
 button,
 .button,
 input[type=button],
-input[type=submit] {
+input[type=submit], .notice {
   padding-top: 0.5rem;
   padding-bottom: 0.5rem; }
 
@@ -4755,7 +4755,7 @@ input[type=submit] {
 button,
 .button,
 input[type=button],
-input[type=submit] {
+input[type=submit], .notice {
   padding-left: 1rem;
   padding-right: 1rem; }
 
@@ -7213,7 +7213,7 @@ body {
   min-height: 100vh;
   box-sizing: border-box;
   font-size: 0.875rem;
-  line-height: 1.2em;
+  line-height: 1.5;
   font-weight: 400; }
 
 a {
diff --git a/src/rawdata/scss/_core.scss b/src/rawdata/scss/_core.scss
index e8c9a9b2..b97cebb3 100644
--- a/src/rawdata/scss/_core.scss
+++ b/src/rawdata/scss/_core.scss
@@ -27,7 +27,7 @@ body {
   min-height: 100vh;
   box-sizing: border-box;
   font-size: px2rem(14px);
-  line-height: 1.2em;
+  line-height: 1.5;
   font-weight: 400;
 }
 
diff --git a/src/rawdata/scss/_notices.scss b/src/rawdata/scss/_notices.scss
index bd91dc14..e79e9a9a 100644
--- a/src/rawdata/scss/_notices.scss
+++ b/src/rawdata/scss/_notices.scss
@@ -1,5 +1,7 @@
 .notice {
 	@include usevar(color, notice-text-color);
+	@extend .ph3, .pv2;
+	@extend .br2;
 
 	a {
 		@include usevar(color, notice-text-color);
diff --git a/src/templates/src/include/header.html b/src/templates/src/include/header.html
index fb981950..2aa2cfa1 100644
--- a/src/templates/src/include/header.html
+++ b/src/templates/src/include/header.html
@@ -10,18 +10,10 @@
             <a class="register" id="register-link" href="{{ .Header.RegisterUrl }}">Register</a>
             <a class="login" id="login-link" href="{{ .LoginPageUrl }}">Log in</a>
             <div id="login-popup">
-                <form action="{{ .Header.LoginActionUrl }}" method="post">
-                    <table>
-                        <tr>
-                            <th><label>Username:</label></th>
-                            <td><input type="text" name="username" class="textbox username" value="" /></td>
-                        </tr>
-                        <tr>
-                            <th><label>Password:</label></th>
-                            <td><input type="password" name="password" class="textbox password" value="" /></td>
-                        </tr>
-                    </table>
-					<a class="db" style="padding: 0.5rem 0;" href="{{ .Header.ForgotPasswordUrl }}">Forgot your password?</a>
+                <form action="{{ .Header.LoginActionUrl }}" method="post" class="ma0">
+                    <input type="text" name="username" class="w-100" value="" placeholder="Username" />
+                    <input type="password" name="password" class="w-100 mt1" value="" placeholder="Password" />
+                    <a class="db" style="padding: 0.5rem 0;" href="{{ .Header.ForgotPasswordUrl }}">Forgot your password?</a>
                     <input type="hidden" name="redirect" value="{{ $.CurrentUrl }}">
                     <div class="pt2">
                         <input type="submit" value="Log In" />
diff --git a/src/templates/src/include/notices.html b/src/templates/src/include/notices.html
index 71abcf1f..56c5e66a 100644
--- a/src/templates/src/include/notices.html
+++ b/src/templates/src/include/notices.html
@@ -1,6 +1,6 @@
-<div class="mb1">
+<div>
 	{{ range . }}
-		<div class="content-block notice notice-{{ .Class }}">
+		<div class="notice notice-{{ .Class }} mb2">
 			{{ .Content }}
 		</div>
 	{{ end }}