diff --git a/brutaldon/static/css/brutal-css.css b/brutaldon/static/css/brutal-css.css
index e44a1ae..6329fec 100644
--- a/brutaldon/static/css/brutal-css.css
+++ b/brutaldon/static/css/brutal-css.css
@@ -1,3 +1,13 @@
 img.avatar {
-    height: 90px;
+    height: 3rem;
+}
+
+h3 {
+	margin-top: 1rem;
+	margin-bottom: 1rem;
+}
+
+figure > p {
+	margin-top: 0rem;
+	margin-bottom: 0rem;
 }
diff --git a/brutaldon/static/css/brutaldon.css b/brutaldon/static/css/brutaldon.css
index 75ccb35..98d4d27 100644
--- a/brutaldon/static/css/brutaldon.css
+++ b/brutaldon/static/css/brutaldon.css
@@ -235,3 +235,7 @@ div.poll {
 {
     margin-top: 0;
 }
+button > a {
+    color: white;
+}
+
diff --git a/brutaldon/static/css/simple.css b/brutaldon/static/css/simple.css
index 984203c..23b85a7 100644
--- a/brutaldon/static/css/simple.css
+++ b/brutaldon/static/css/simple.css
@@ -73,12 +73,16 @@ body {
   background-color: var(--bg);
   font-size: 1.15rem;
   line-height: 1.5;
+  /* display: flex; */
+  /* flex-direction: column; */
+  /* max-width: 50rem; */
+  /* justify-content: center; */
   display: grid;
   grid-template-columns: 1fr min(45rem, 90%) 1fr;
   margin: 0;
 }
 body > * {
-  grid-column: 2;
+  /* grid-column: 2; */
 }
 
 /* Make the header bg full width, but the content inline with body */
@@ -87,7 +91,7 @@ body > header {
   border-bottom: 1px solid var(--border);
   text-align: center;
   padding: 0 0.5rem 2rem 0.5rem;
-  grid-column: 1 / -1;
+  /* grid-column: 1 / -1; */
 }
 
 body > header > *:only-child {
@@ -130,7 +134,6 @@ h2 {
 
 h3 {
   font-size: 2rem;
-  margin-top: 3rem;
 }
 
 h4 {
@@ -262,7 +265,7 @@ header > nav ol {
   align-content: space-around;
   align-items: center;
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
   flex-wrap: wrap;
   justify-content: center;
   list-style-type: none;
diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index 6b9f070..48c0f1f 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -30,7 +30,7 @@
         <meta name="twitter:description" property="og:description"
               content="A brutalist, web-1.0 web client for Mastodon and Pleroma. Supports text-only browsers like Lynx, older browsers, as well as the latest mainstream browsers. All JavaScript is completely optional and progressively enhances the core application.">
         <!-- Minified version -->
-        <link rel="stylesheet" href="https://cdn.simplecss.org/simple.min.css">
+	<link rel="stylesheet" href="{% static 'css/simple.css' %}">
         <link rel="stylesheet" href="{% static 'css/brutal-css.css' %}">
         {% if not preferences %}
             <link rel="stylesheet"
@@ -55,13 +55,14 @@
         {% endif %}
     </head>
     <body ic-global-include='{"csrfmiddlewaretoken": "{{ csrf_token }}"}'>
-        <div id="page-load-indicator"></div>
-        <div id="new-toot-modal" class="modal"></div>
+        <div></div>
+        <div>
         {% block navbar %}
             <nav role="navigation"
                  aria-label="main navigation">
-                <span>
-                    <a href="{% url "home" %}">
+                <ul>
+                <li>
+                    <a href="{% url "home" %}" class="nav-link">
                         {% if own_acct %}
                         <img class="avatar" src="{{ own_acct.avatar_static }}"
                              alt="Brutaldon ('{{ own_acct.username }}')">
@@ -70,14 +71,16 @@
                             alt="Brutaldon">
                         {% endif %}
                     </a>
-                </span>
+                </li>
                 {% if request.session.active_instance and request.session.active_username %}
                         <!-- navbar start, navbar end -->
-                        <span>
-                            <a href="{% url "home" %}">
+                        <li>
+                            <a href="{% url "home" %}" class="nav-link">
                                 <span>Home</span>
                             </a>
-                            <a href="{% url "note" %}">
+                        </li>
+                        <li>
+                            <a href="{% url "note" %}" class="nav-link">
                                 {% if preferences.notifications and not preferences.theme.is_brutalist %}
                                     <span ic-src="{% url 'notes_count' %}"
                                           ic-poll="{{ preferences.poll_frequency }}s"
@@ -98,28 +101,39 @@
                                     <span >Notifications</span>
                                 {% endif %}
                             </a>
-                            <a href="{% url "local" %}">
+                        </li>
+                        <li>
+                            <a href="{% url "local" %}" class="nav-link">
                                 <span >Local</span>
                             </a>
-                            <a href="{% url "fed" %}">
+                        </li>
+                        <li>
+                            <a href="{% url "fed" %}" class="nav-link">
                                 <span >Federated</span>
                             </a>
-                            <a href="{% url "toot" %}"
+                        </li>
+                       <li>
+			    <a href="{% url "toot" %}" class="nav-link">
                                 <span >New Toot</span>
                             </a>
-                            <a href="{% url "search" %}"
+                       </li>
+                       <li>
+			    <a href="{% url "search" %}" class="nav-link">
                                 <span >Search</span>
                             </a>
-                        </span>
-                            <a href="{% url "settings" %}">
+                       </li>
+                       <li>
+                            <a href="{% url "settings" %}" class="nav-link">
                                 <span >Settings</span>
                             </a>
-                            <a href="{% url "accounts" %}">
+                       </li>
+                       <li>
+                            <a href="{% url "accounts" %}" class="nav-link">
                                 <span >Accounts</span>
                             </a>
-                        </div>
-                    </div>
+                       </li>
                 {% endif %}
+                </ul>
             </nav>
         {% endblock %}
 
@@ -130,7 +144,7 @@
                         Brutaldon
                     </h1>
                     <p class="subtitle">
-                        Brutaldon is totally a thing.
+                        Brutaldon is a brutalist minimal client for Mastodon.
                     </p>
                 {% endblock %}
             </div>
@@ -188,5 +202,7 @@
             {% endblock %}
 
         {% endif %}
+        </div>
+        <div></div>
     </body>
 </html>
diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html
index 38aaa77..e7363a7 100644
--- a/brutaldon/templates/main/toot_partial.html
+++ b/brutaldon/templates/main/toot_partial.html
@@ -11,15 +11,12 @@
         <article>
 {% endif %}
 
-<figure >
-    <p >
+<figure>
         <a href="{% url "user" toot.account.acct %}">
             <img class="avatar" loading="auto" src="{{ toot.account.avatar_static }}"
                  alt="">
         </a>
-    </p>
 </figure>
-<div >
     <div >
         <p>
             <h3><strong>{{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}}</strong></h3>
@@ -31,9 +28,11 @@
             {% if reblog %}
                 <br>
                 Boosted by @{{ reblog_by }}
+		<figure>
             <a href="{% url "user" reblog_by %}">
                 <img class="avatar" loading="auto" src ="{{ reblog_icon }}" alt="">
             </a>
+		</figure>
             {% endif %}
         </p>
         {% if toot.spoiler_text %}
@@ -192,7 +191,6 @@
                             </span>
                         </span>
                 </a>
-                <i></i>
             </div>
             <div >
                 {% if toot.account.acct == own_acct.acct %}
@@ -216,7 +214,6 @@
                 &nbsp;&nbsp;
                 {% if toot.in_reply_to_id or toot.replies_count > 0 %}
                     <a href="{% url "thread" toot.id %}#toot-{{ toot.id }}">
-                        <span ></span>
                         <strong> thread</strong>
                     </a>
                 {% else %}
@@ -228,7 +225,5 @@
         </nav>
     {% endif %}
 
-</div>
-<div ></div>
         </article>
 {% endif %}
