diff --git a/content/about/_index.md b/content/about/_index.md
new file mode 100644
index 00000000..ac36e062
--- /dev/null
+++ b/content/about/_index.md
@@ -0,0 +1,2 @@
++++
++++
diff --git a/content/about/code-of-conduct.md b/content/about/code-of-conduct.md
new file mode 100644
index 00000000..8d092bdb
--- /dev/null
+++ b/content/about/code-of-conduct.md
@@ -0,0 +1,5 @@
++++
+title = "Code of Conduct"
++++
+
+We are in the process of drafting one. Coming soon ...
diff --git a/templates/base.html b/templates/base.html
index 8ab9ae50..e4b904d5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -66,8 +66,8 @@
               </a>
               <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                 <a class="dropdown-item" href="{{ config.base_url | safe }}/association/">Governance</a>
-                <a class="dropdown-item" href="{{ config.base_url | safe }}/communities/local/">Code of Conduct</a>
-                <a class="dropdown-item" href="{{ config.base_url | safe }}/communities/finland/">Contact</a>
+                <a class="dropdown-item" href="{{ config.base_url | safe }}/about/code-of-conduct/">Code of Conduct</a>
+                <a class="dropdown-item" href="{{ config.base_url | safe }}/communities/members/">Contact</a>
               </div>
             </li>
 
@@ -111,7 +111,7 @@
 
             <!-- Join us -->
             <li class="nav-item">
-              <a class="nav-link" href="{{ config.base_url | safe }}/blog/">Join us</a>
+              <a class="nav-link" href="https://forms.gle/qCVVRGXPi3Hq7inW6">Join us</a>
             </li>
           </ul>
         </div>