diff --git a/dist/ratfe20.css b/dist/ratfe20.css
index 23aeb30..f0fb865 100644
--- a/dist/ratfe20.css
+++ b/dist/ratfe20.css
@@ -66,7 +66,7 @@ body
 #main
 {
     width: 640px;
-    max-width: 640px;
+    max-width: 640px !important;
     min-width: 640px;
     overflow: hidden;
     min-height: 600px;
@@ -166,9 +166,9 @@ ul li:first-child a.sidebarbtn
  **************************/
 .status
 {
-    display: flex;
-    margin: 7px;
+    padding: 4px 2px 0 4px;
     border-bottom: 1px solid #cacaca !important;
+    width: 100%;
 }
 
 .status .profile-picture
@@ -184,20 +184,32 @@ ul li:first-child a.sidebarbtn
     margin-bottom: 5px;
 }
 
+.pfp-td
+{
+    width: 56px;
+}
+
+.status tr
+{
+    width: auto;
+}
+
 .status .status-info
 {
-    flex: 1;
     display: flex;
     margin: 0 5px 0px;
     min-width: 0;
     flex-direction: column;
+    width: auto;
 }
 
 .status .instance-info
 {
     font-style: italic;
     text-decoration: none;
-    margin: 0 3px;
+    margin: 0 4px;
+    font-size: 14px;
+    padding-top: 1px;
 }
 
 .status .poster-stats
@@ -344,19 +356,18 @@ ul li:first-child a.sidebarbtn
     background-repeat: no-repeat;
     background-size: cover;
     height: 256px;
-    align-items: end;
 }
 
 .acct-pfp
 {
     position: relative;
-    z-index: 1;
+    z-index: 100;
     border: 3px solid #cacaca;
     background-color: #fff;
     border-radius: 8px;
     width: 100px;
     height: 100px;
-    top: 38px;
+    top: -8px;
     left: 150px;
     margin-top: -108px;
     margin-left: -108px;
@@ -368,6 +379,7 @@ ul li:first-child a.sidebarbtn
 .acct-header
 {
     display: flex;
+    z-index: 1;
     padding-left: 160px;
     background: linear-gradient(#fff, #f1f1f1);
     border-bottom: 1px solid #cacaca;
@@ -378,7 +390,7 @@ ul li:first-child a.sidebarbtn
 {
     position: relative;
     left: 160px;
-    top: -10px;
+    top: 200px;
     font-weight: bold;
     text-shadow: 0px 2px 6px #000;
 }
@@ -537,12 +549,16 @@ ul li:first-child a.sidebarbtn
 /* Emoji reacts */
 .emoji-reactions
 {
-    display: flex;
+    display: block;
+    padding: 0;
     margin-top: 8px;
+    margin-bottom: 6px;
 }
 
 .emoji-react-box
 {
+    display: inline-block;
+    list-style-type: none;    
     padding: 3px 7px;
     margin: 0 4px;
 }
diff --git a/src/account.c b/src/account.c
index aded806..d361ad6 100644
--- a/src/account.c
+++ b/src/account.c
@@ -49,13 +49,13 @@ char* construct_account_page(struct mstdnt_account* acct,
                             acct->header,
                             acct->display_name,
                             acct->acct,
-                            acct->avatar,
                             "Statuses",
                             acct->statuses_count,
                             "Following",
                             acct->following_count,
                             "Followers",
                             acct->followers_count,
+                            acct->avatar,
                             statuses_html);
     
     if (result_size == -1)
diff --git a/static/account.html b/static/account.html
index c212f1f..387a927 100644
--- a/static/account.html
+++ b/static/account.html
@@ -6,9 +6,6 @@
     </div>
   </div>
   
-  <div class="acct-pfp" style="background-image:url('%s');">
-  </div>
-  
   <div class="acct-header">
     <a href="#" class="header-btn">
       <span class="btn-header">%s</span>
@@ -25,6 +22,9 @@
       <span class="btn-content">%d</span>
     </a>
   </div>
+
+  <img class="acct-pfp" src="%s">
+
 </div>
 
 <div class="account-content">
diff --git a/static/attachment_image.html b/static/attachment_image.html
index a664a8c..7539a50 100644
--- a/static/attachment_image.html
+++ b/static/attachment_image.html
@@ -1 +1 @@
-<img class="zoom" src="%s">
+<img class="zoom" width="256" src="%s">
diff --git a/static/emoji_reaction.html b/static/emoji_reaction.html
index 5159a4c..2c8a687 100644
--- a/static/emoji_reaction.html
+++ b/static/emoji_reaction.html
@@ -1,4 +1,3 @@
-
-<div class="emoji-react-box btn">
+<li class="emoji-react-box btn">
   <span class="emoji">%s</span> %u
-</div>
+</li>
diff --git a/static/emoji_reactions.html b/static/emoji_reactions.html
index 0036321..36947ed 100644
--- a/static/emoji_reactions.html
+++ b/static/emoji_reactions.html
@@ -1,3 +1,3 @@
-<div class="emoji-reactions">
+<ul class="emoji-reactions">
   %s
-</div>
+</ul>
diff --git a/static/index.html b/static/index.html
index d971def..c2a11ac 100644
--- a/static/index.html
+++ b/static/index.html
@@ -17,7 +17,7 @@
           <!-- Searchbox -->
           <form action="%s/search" method="get">
             <input type="textbox" class="group group-left group-inputbox" placeholder="%s" id="searchbox" name="q"><!-- i hate HTML
-                                                                                                                     --><input type="submit" class="group group-right" value="%s">
+         --><input type="submit" class="group group-right" value="%s">
           </form>
         </div>
       </header>
diff --git a/static/status.html b/static/status.html
index fb85240..a68422c 100644
--- a/static/status.html
+++ b/static/status.html
@@ -1,50 +1,59 @@
-<div class="status">
-  <div class="profile-picture" style="background-image:url('%s');">
-  </div>
-  <div class="status-info">
-    <div class="poster-stats">
-      <span class="username">%s</span>
-      <a class="instance-info" href="%s/@%s">%s</a>
-      <span class="alignend status-visibility">
-        %s
-      </span>
-    </div>
-    <span class="status-content">
-      %s
-    </span>
-    %s
-    %s
-    <div class="status-interact">
-      <ul>
-        <li>
-          <form action="%s/status/%s/reply" method="post">
-            <input class="nobutton" type="submit" value="Reply%s">
-          </form>
-        </li>
-        <li>
-          <form action="%s/status/%s/interact" method="post">
-            <input type="hidden" name="itype" value="repeat">
-            <input class="nobutton %s" type="submit" value="Repeat%s">
-          </form>
-        </li>
-        <li>
-          <form action="%s/status/%s/interact" method="post">
-            <input type="hidden" name="itype" value="like">
-            <input class="nobutton %s" type="submit" value="Yeah!%s">
-          </form>
-        </li>
-        <li>
-          <form action="%s/status/%s/quick" method="post">
-            <input class="nobutton" type="submit" value="Quick">
-          </form>
-        </li>
-        <li>
-          <a class="nobutton" href="%s/status/%s">View</a>
-        </li>
-        <li>
-          <a class="nobutton" onclick="alert('hi');" href="#">Emoji</a>
-        </li>
-      </ul>
-    </div>
-  </div>
-</div>
+<table class="status">
+  <tr>
+    <td class="pfp-td">
+      <img src="%s" width="56">
+    </td>
+    <td class="status-info">
+      <table>
+        <tr>
+          <td>
+            <div class="poster-stats">
+              <span class="username">%s</span>
+              <a class="instance-info" href="%s/@%s">%s</a>
+              <span class="alignend status-visibility">
+                %s
+              </span>
+            </div>
+            <span class="status-content">
+              %s
+            </span>
+            %s
+            %s
+            <div class="status-interact">
+              <ul>
+                <li>
+                  <form action="%s/status/%s/reply" method="post">
+                    <input class="nobutton" type="submit" value="Reply%s">
+                  </form>
+                </li>
+                <li>
+                  <form action="%s/status/%s/interact" method="post">
+                    <input type="hidden" name="itype" value="repeat">
+                    <input class="nobutton %s" type="submit" value="Repeat%s">
+                  </form>
+                </li>
+                <li>
+                  <form action="%s/status/%s/interact" method="post">
+                    <input type="hidden" name="itype" value="like">
+                    <input class="nobutton %s" type="submit" value="Yeah!%s">
+                  </form>
+                </li>
+                <li>
+                  <form action="%s/status/%s/quick" method="post">
+                    <input class="nobutton" type="submit" value="Quick">
+                  </form>
+                </li>
+                <li>
+                  <a class="nobutton" href="%s/status/%s">View</a>
+                </li>
+                <li>
+                  <a class="nobutton" onclick="alert('hi');" href="#">Emoji</a>
+                </li>
+              </ul>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>