diff --git a/dist/treebird20.css b/dist/treebird20.css
index 46cb13d..324d147 100644
--- a/dist/treebird20.css
+++ b/dist/treebird20.css
@@ -592,8 +592,7 @@ svg.in-reply-to-icon
 
 .notification-info
 {
-    margin-top: 5px;
-    margin-bottom: 5px;
+    margin-top: 9px;
 }
 
 .notification-info img,
@@ -602,6 +601,7 @@ svg.in-reply-to-icon
     margin-left: 41px;
     width: 24px;
     height: 24px;
+    margin-right: 6px;
     border-radius: 3px;
     vertical-align: middle;
     object-fit: cover;
@@ -622,7 +622,7 @@ svg.in-reply-to-icon
 /***************************
  *      Statuses           *
  **************************/
-.status,
+.status .status-table,
 .notification-regular,
 .scrobble
 {
@@ -632,7 +632,7 @@ svg.in-reply-to-icon
     border-spacing: 0px;
 }
 
-.status-hide:checked + .status
+.status-hide:checked + .status .status-table
 {
     padding: 5px 10px;
 }
@@ -699,7 +699,8 @@ svg.in-reply-to-icon
 }
 
 .status-hide:checked + .status .status-data,
-.status-hide:checked + .status .pfp-td
+.status-hide:checked + .status .pfp-td,
+.status-hide:checked + .status .notification-info
 {
     display: none;
 }
@@ -719,7 +720,7 @@ svg.in-reply-to-icon
     object-fit: cover;
 }
 
-.status tr
+.status table tr
 {
     width: auto;
 }
diff --git a/static/search_all.tmpl b/static/search_all.tmpl
new file mode 100644
index 0000000..8804b65
--- /dev/null
+++ b/static/search_all.tmpl
@@ -0,0 +1,18 @@
+<table class="tabs ui-table">
+  <tr>
+    <td>
+      <label
+      <a href="{{%s:prefix}}/search/statuses?q={{%s:query}}"><input class="tab-btn btn {{%s:statuses_active}}" type="button" value="{{%s:statuses}}"></a>
+    </td>
+    <td>
+      <a href="{{%s:prefix}}/search/accounts?q={{%s:query}}"><input class="tab-btn btn {{%s:accounts_active}}" type="button" value="{{%s:accounts}}"></a>
+    </td>
+    <td>
+      <a href="{{%s:prefix}}/search/hashtags?q={{%s:query}}"><input class="tab-btn btn {{%s:hashtags_active}}" type="button" value="{{%s:hashtags}}"></a>
+    </td>
+  </tr>
+</table>
+
+<div class="search-results">
+  {{%s:results}}
+</div>
diff --git a/static/status.tmpl b/static/status.tmpl
index e22b423..df09286 100644
--- a/static/status.tmpl
+++ b/static/status.tmpl
@@ -1,49 +1,51 @@
 <input type="checkbox" class="status-hide" id="status-toggle-{{%s:status_id}}" {{ %s:thread_hidden }}>
-<table id="{{%s:status_id}}" class="status ui-table">
+<div class="status">
   {{ %s : notif_info }}
-  <tr>
-    <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
-      <img src="{{%s:avatar}}">
-    </td>
-    <td class="status-info">
-      <div class="poster-stats">
-        <span class="username">{{%s:username}}</span>
-        <a class="instance-info" href="{{%s:prefix}}/@{{%s:acct}}">{{%s:acct}}</a>
-        <span class="alignend">
-          <div class="menu-container status-visibility">
-            {{%s:visibility}}
-            <div class="menu">
-              <ul>
-                <li>
-                  <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
-                    <input type="hidden" name="itype" value="{{%s:unmute}}mute">
-                    <input type="submit" class="btn-menu" value="{{%s:unmute_btn}}">
-                  </form>
-                </li>
-                <li>
-                  <form action="{{%s:prefix}}/status/{{%s:status_id}/interact" method="post">
-                    <input type="hidden" name="itype" value="{{%s:unbookmark}}bookmark">
-                    <input type="submit" class="btn-menu" value="{{%s:unbookmark_btn}}">
-                  </form>
-                </li>
-                {{%s:pin_status}}
-                {{%s:delete_status}}
-              </ul>
+  <table id="{{%s:status_id}}" class="status-table ui-table">
+    <tr>
+      <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
+        <img src="{{%s:avatar}}">
+      </td>
+      <td class="status-info">
+        <div class="poster-stats">
+          <span class="username">{{%s:username}}</span>
+          <a class="instance-info" href="{{%s:prefix}}/@{{%s:acct}}">{{%s:acct}}</a>
+          <span class="alignend">
+            <div class="menu-container status-visibility">
+              {{%s:visibility}}
+              <div class="menu">
+                <ul>
+                  <li>
+                    <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
+                      <input type="hidden" name="itype" value="{{%s:unmute}}mute">
+                      <input type="submit" class="btn-menu" value="{{%s:unmute_btn}}">
+                    </form>
+                  </li>
+                  <li>
+                    <form action="{{%s:prefix}}/status/{{%s:status_id}/interact" method="post">
+                      <input type="hidden" name="itype" value="{{%s:unbookmark}}bookmark">
+                      <input type="submit" class="btn-menu" value="{{%s:unbookmark_btn}}">
+                    </form>
+                  </li>
+                  {{%s:pin_status}}
+                  {{%s:delete_status}}
+                </ul>
+              </div>
             </div>
-          </div>
-          <label for="status-toggle-{{%s:status_id}}" class="status-view"></label>
-        </span>
-      </div>
-      <div class="status-data">
-        {{%s:in_reply_to_str}}
-        <span class="status-content">
-          {{%s:status_content}}
-        </span>
-        {{%s:attachments}}
-        {{%s:interactions}}
-        {{%s:emoji_reactions}}
-        {{%s:interaction_btns}}
-      </div>
-    </td>
-  </tr>
-</table>
+            <label for="status-toggle-{{%s:status_id}}" class="status-view"></label>
+          </span>
+        </div>
+        <div class="status-data">
+          {{%s:in_reply_to_str}}
+          <span class="status-content">
+            {{%s:status_content}}
+          </span>
+          {{%s:attachments}}
+          {{%s:interactions}}
+          {{%s:emoji_reactions}}
+          {{%s:interaction_btns}}
+        </div>
+      </td>
+    </tr>
+  </table>
+</div>