diff --git a/config/settings.py b/config/settings.py
index 6229eb87..c830041b 100755
--- a/config/settings.py
+++ b/config/settings.py
@@ -356,3 +356,16 @@ if not LOCAL_DEVELOPMENT:
 
 # Markdown content
 BASE_CONTENT = env("BOOST_CONTENT_DIRECTORY", "/website")
+
+# Machina settings
+MACHINA_DEFAULT_AUTHENTICATED_USER_FORUM_PERMISSIONS = [
+    "can_see_forum",
+    "can_read_forum",
+    "can_start_new_topics",
+    "can_reply_to_topics",
+    "can_edit_own_posts",
+    "can_post_without_approval",
+    "can_create_polls",
+    "can_vote_in_polls",
+    "can_download_file",
+]
diff --git a/static/css/styles.css b/static/css/styles.css
index 747a60e5..0482e100 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -887,14 +887,18 @@ input[type=file] {
   left: 0px;
 }
 
+.inset-y-0 {
+  top: 0px;
+  bottom: 0px;
+}
+
 .inset-x-0 {
   left: 0px;
   right: 0px;
 }
 
-.inset-y-0 {
-  top: 0px;
-  bottom: 0px;
+.right-3 {
+  right: 0.75rem;
 }
 
 .top-0 {
@@ -917,10 +921,6 @@ input[type=file] {
   left: 0px;
 }
 
-.right-3 {
-  right: 0.75rem;
-}
-
 .top-14 {
   top: 3.5rem;
 }
@@ -1149,6 +1149,10 @@ input[type=file] {
   margin-right: 0.25rem;
 }
 
+.-mt-1 {
+  margin-top: -0.25rem;
+}
+
 .block {
   display: block;
 }
@@ -1277,6 +1281,10 @@ input[type=file] {
   width: 33.333333%;
 }
 
+.w-\[100px\] {
+  width: 100px;
+}
+
 .w-6 {
   width: 1.5rem;
 }
@@ -1313,6 +1321,10 @@ input[type=file] {
   width: 200px;
 }
 
+.w-\[110px\] {
+  width: 110px;
+}
+
 .min-w-0 {
   min-width: 0px;
 }
@@ -1664,6 +1676,15 @@ input[type=file] {
   background-color: rgb(49 74 87 / var(--tw-bg-opacity));
 }
 
+.bg-red-500 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+}
+
+.bg-green\/50 {
+  background-color: rgb(90 213 153 / 0.5);
+}
+
 .bg-opacity-70 {
   --tw-bg-opacity: 0.7;
 }
@@ -1877,6 +1898,10 @@ input[type=file] {
   padding-left: 0.75rem;
 }
 
+.pl-2 {
+  padding-left: 0.5rem;
+}
+
 .pl-8 {
   padding-left: 2rem;
 }
@@ -1897,10 +1922,6 @@ input[type=file] {
   padding-bottom: 0.25rem;
 }
 
-.pl-2 {
-  padding-left: 0.5rem;
-}
-
 .pb-16 {
   padding-bottom: 4rem;
 }
diff --git a/templates/base.html b/templates/base.html
index edfe7f88..9f34182a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -37,6 +37,11 @@
     <div class="container mx-auto">
       {% include "includes/_header.html" %}
 
+
+      <div class="w-full">
+        {% block messages %}{% include "partials/messages.html" %}{% endblock messages %}
+      </div>
+
       {% comment %}body block is for use in forums{% endcomment %}
       {% block forum_body %}{% endblock %}
 
diff --git a/templates/board_base.html b/templates/board_base.html
index 9c74d0fc..a393e59f 100644
--- a/templates/board_base.html
+++ b/templates/board_base.html
@@ -52,12 +52,6 @@
       {% endspaceless %}
     </div>
   </div>
-  <div class="flex">
-    <div class="w-full">
-      <br />
-      {% block messages %}{% include "partials/messages.html" %}{% endblock messages %}
-    </div>
-  </div>
 </div>
 {% endblock forum_body %}
 
diff --git a/templates/forum_conversation/topic_detail.html b/templates/forum_conversation/topic_detail.html
index 61c3a729..f2cecdf4 100644
--- a/templates/forum_conversation/topic_detail.html
+++ b/templates/forum_conversation/topic_detail.html
@@ -49,9 +49,9 @@
               {% endif %}
             </div>
               {% spaceless %}
-              <h4 class="text-2xl m-0 subject mb-3">
+              <h4 class="text-2xl m-0 subject mb-3 items-center">
                 {{ post.subject }}
-                &nbsp;<a href="{% url 'forum_conversation:topic' forum.slug forum.pk topic.slug topic.pk %}?post={{ post.pk }}#{{ post.pk }}">&#182;</a>
+                &nbsp;<a href="{% url 'forum_conversation:topic' forum.slug forum.pk topic.slug topic.pk %}?post={{ post.pk }}#{{ post.pk }}"><i class="fas fa-link text-white/60 text-sm"></i></a>
               </h4>
               {% endspaceless %}
               <p class="p-0">
diff --git a/templates/includes/_header.html b/templates/includes/_header.html
index b459ff86..d5473fef 100644
--- a/templates/includes/_header.html
+++ b/templates/includes/_header.html
@@ -7,7 +7,7 @@
     <div>
       <div class="hidden md:block mx-auto px-3 sm:px-6 bg-charcoal">
         <nav class="relative flex items-center justify-between sm:h-10 pt-6 pb-6" aria-label="Global">
-          <div class="md:flex md:space-x-10 pt-3 pb-3 pl-3">
+          <div class="md:flex md:space-x-10 pt-3 pb-3 pl-3 items-center">
             <a href="{% url 'boost-about' %}" class="font-medium text-white hover:text-orange">About</a>
 
             <a href="{% url 'support' %}" class="font-medium text-white hover:text-orange">Support</a>
@@ -26,9 +26,21 @@
               <a href="{% url 'account_logout' %}" class="font-medium text-white hover:text-orange">Log Out</a>
             {% endif %}
 
-            <a href="#" class="font-medium text-white hover:text-orange">
-              <img class="mt-1" src="{% static 'img/icons/icon-search.svg' %}" alt="Search" />
-            </a>
+            <form action="https://www.google.com/search" class="items-center relative" method="get" name="searchform" target="_blank">
+              <input name="sitesearch" type="hidden" value="boost.org">
+              <input autocomplete="on"
+                     class="rounded-lg border-slate py-2 px-3 text-xs bg-charcoal text-white"
+                     name="q"
+                     placeholder="Search Boost.org"
+                     required="required"
+                     type="text"
+              >
+              <span class="absolute inset-y-0 right-3 flex items-center pl-2">
+                <button type="submit">
+                  <img class="" src="{% static 'img/icons/icon-search.svg' %}" alt="Search" />
+                </button>
+              </span>
+            </form>
           </div>
           <div class="items-center flex">
             <span id="icon-container" class="inline-block w-6 h-6"></span>
diff --git a/templates/partials/messages.html b/templates/partials/messages.html
index c1eb87b9..b44cf02b 100644
--- a/templates/partials/messages.html
+++ b/templates/partials/messages.html
@@ -1,10 +1,10 @@
-<div id="messages">
-{% if messages %}
-{% for message in messages %}
-<div class="alert alert-{{ message.tags }} {% if 'error' in message.tags %}alert-danger{% endif %} fade show">
-  <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-  {{ message }}
-</div>
-{% endfor %}
-{% endif %}
+<div id="messages" class="w-full text-center">
+  {% if messages %}
+    {% for message in messages %}
+      <div class="w-2/3 mx-auto text-left items-center text-white rounded text-base px-3 py-2 {% if 'error' in message.tags %}bg-red-500{% else %}bg-green/50{% endif %} fade show">
+        <button type="button" class="float-right" data-dismiss="alert" aria-hidden="true">&times;</button>
+        {{ message }}
+      </div>
+    {% endfor %}
+  {% endif %}
 </div>