diff --git a/remarkbox_theme_meta/static/theme/meta/css/diff.css b/remarkbox_theme_meta/static/theme/meta/css/diff.css
index 4da3524..30e83ca 100644
--- a/remarkbox_theme_meta/static/theme/meta/css/diff.css
+++ b/remarkbox_theme_meta/static/theme/meta/css/diff.css
@@ -68,3 +68,44 @@ input {
     padding-left: 60px;
     padding-top: 5px;
 }
+
+
+ol, ul {
+    padding-left: 40px;
+}
+
+ul {
+    list-style: outside;
+}
+
+/* alerts */
+#alerts {
+  width: 36%;
+  margin: auto;
+  right: 50%;
+  margin-right: -18%;
+  position: fixed;
+  z-index: 100;
+}
+
+.close {
+  margin-left: 10px;
+  float: left;
+}
+
+.alert {
+  text-align: center;
+  color: #ffffff; 
+  font-weight: bold; 
+  border-radius: 6px;
+  margin-bottom: 6px;
+  padding: 6px;
+}
+
+.alert-warning, .alert-error {
+  background-color: #CB0003;
+}
+
+.alert-success, .alert-notice {
+  background-color: #517DA4;
+}
diff --git a/remarkbox_theme_meta/templates/meta-base.j2 b/remarkbox_theme_meta/templates/meta-base.j2
index bab0af2..1d7bc30 100644
--- a/remarkbox_theme_meta/templates/meta-base.j2
+++ b/remarkbox_theme_meta/templates/meta-base.j2
@@ -31,8 +31,13 @@
       <a class="navlink" href="{{ main_domain }}#faq">FAQ</a>
       <a class="navlink" href="{{ main_domain }}#about">About</a>
       <a class="navlink" href="{{ main_domain }}#remarkbox-demo">Demo</a>
-      <a class="button" href="{{ main_domain }}#beta">Log in</a>
-      <a class="button red" href="{{ main_domain }}#beta">Join</a>
+      {%- if request.user %}
+      <a class="button" href="#">{{ request.user.name }}</a>
+      <a class="button red" href="/log-out">Log out</a>
+      {%- else %}
+      <a class="button" href="/join-or-log-in">Log in</a>
+      <a class="button red" href="/join-or-log-in">Join</a>
+      {%- endif %}
     </div>
 </div>
 
@@ -45,9 +50,9 @@
     {%- block menu %}
       <a href="/">home</a> |
       <a href="/new">new thread</a> |
-    
+   
       {%- if request.user %}
-      {{request.user.name}} <a href="/log-out">[log out]</a>
+      {{ request.user.name }} <a href="/log-out">[log out]</a>
       {% else %}
       <a href="/join-or-log-in">join-or-log-in</a>
       {%- endif %}
@@ -62,6 +67,7 @@
 <br>
 <br>
 <br>
+<br>
 
 <noscript>
   <style>