diff --git a/plugins/emojy/list.templ b/plugins/emojy/list.templ
index 0815a64..4d35954 100644
--- a/plugins/emojy/list.templ
+++ b/plugins/emojy/list.templ
@@ -1,23 +1,34 @@
 package emojy
 
 templ (p *EmojyPlugin) listTempl(emojy emojyMap) {
-    @p.emojyNav()
-    for _, v := range emojy {
-        <div class="row row-cols-5">
-            for _, c := range v {
-                <div class="card text-center">
-                    <div class="card-body">
-                        <span>
-                            <img src={ c.URL }
-                                class="card-img-top mx-auto d-block"
-                                alt={ c.Emojy }
-                                width="100"
-                                style="max-width: 100px" />
-                        </span>
-                        <h5 class="card-title">{ c.Emojy }</h5>
+    <div class="grid-container">
+        <div class="grid-x">
+            <div class="cell">
+                <h2>Emojy</h2>
+            </div>
+        </div>
+        <div class="grid-x">
+            <div class="cell">
+                @p.emojyNav()
+            </div>
+        </div>
+        <div class="grid-x grid-margin-x small-up-2 medium-up-3">
+            for _, v := range emojy {
+                for _, c := range v {
+                    <div class="cell">
+                    <div class="card">
+                      <img src={ c.URL }
+                            class=""
+                            style="max-height: 100px"
+                            alt={ c.Emojy }
+                            />
+                      <div class="card-divider">
+                        { c.Emojy }
+                      </div>
                     </div>
-                </div>
+                    </div>
+                }
             }
         </div>
-    }
+    </div>
 }
\ No newline at end of file
diff --git a/plugins/emojy/list_templ.go b/plugins/emojy/list_templ.go
index 82ad7f0..0dbb947 100644
--- a/plugins/emojy/list_templ.go
+++ b/plugins/emojy/list_templ.go
@@ -23,17 +23,21 @@ func (p *EmojyPlugin) listTempl(emojy emojyMap) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"grid-container\"><div class=\"grid-x\"><div class=\"cell\"><h2>Emojy</h2></div></div><div class=\"grid-x\"><div class=\"cell\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		templ_7745c5c3_Err = p.emojyNav().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div class=\"grid-x grid-margin-x small-up-2 medium-up-3\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		for _, v := range emojy {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row row-cols-5\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
 			for _, c := range v {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"card text-center\"><div class=\"card-body\"><span><img src=\"")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"cell\"><div class=\"card\"><img src=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
@@ -41,7 +45,7 @@ func (p *EmojyPlugin) listTempl(emojy emojyMap) templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card-img-top mx-auto d-block\" alt=\"")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"\" style=\"max-height: 100px\" alt=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
@@ -49,28 +53,28 @@ func (p *EmojyPlugin) listTempl(emojy emojyMap) templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" width=\"100\" style=\"max-width: 100px\"></span><h5 class=\"card-title\">")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><div class=\"card-divider\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var2 string
 				templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(c.Emojy)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `plugins/emojy/list.templ`, Line: 16, Col: 56}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `plugins/emojy/list.templ`, Line: 25, Col: 33}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</h5></div></div>")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
 		}
 		if !templ_7745c5c3_IsBuffer {
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
diff --git a/plugins/emojy/stats.templ b/plugins/emojy/stats.templ
index be676ba..68057a3 100644
--- a/plugins/emojy/stats.templ
+++ b/plugins/emojy/stats.templ
@@ -3,44 +3,51 @@ package emojy
 import "fmt"
 
 templ (p *EmojyPlugin) emojyNav() {
-    <nav class="navbar navbar-expand-lg bg-body-tertiary">
-      <div class="container-fluid">
-          <ul class="navbar-nav">
-            <li class="nav-item">
-              <a class="nav-link" href="/emojy/stats">Stats</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/emojy/list">List</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/emojy/new">Upload</a>
-            </li>
-          </ul>
-        </div>
-    </nav>
+    <ul class="menu">
+        <li>
+            <a href="/emojy/stats">Stats</a>
+        </li>
+        <li>
+            <a href="/emojy/list">List</a>
+        </li>
+        <li>
+            <a href="/emojy/new">Upload</a>
+        </li>
+    </ul>
 }
 
 templ (p *EmojyPlugin) statsIndex(emojy emojyMap) {
-    @p.emojyNav()
-    for categoryName, v := range emojy {
-        <div class="container">
-            <ul class="list-group list-group-flush">
-            for _, c := range v {
-                <li class="list-group-item">
-                { fmt.Sprintf("%d", c.Count) } -
-                if categoryName != "emoji" && c.OnServer {
-                    <span>✅</span>
-                } else if categoryName != "emoji" {
-                    <span>✅</span>
-                }
-                if c.URL != "" {
-                    <img src={ c.URL } alt={ c.Emojy } />
-                } else {
-                    { c.Emojy }
-                }
-                </li>
-            }
-            </ul>
+    <div class="grid-container">
+        <div class="grid-x">
+            <div class="cell">
+                <h2>Emojy</h2>
+            </div>
         </div>
-    }
+        <div class="grid-x">
+            <div class="cell">
+                @p.emojyNav()
+            </div>
+        </div>
+        <div class="cell">
+            for categoryName, v := range emojy {
+                <ul class="no-bullet">
+                    for _, c := range v {
+                        <li class="">
+                        { fmt.Sprintf("%d", c.Count) } -
+                        if categoryName != "emoji" && c.OnServer {
+                            <span>✅</span>
+                        } else if categoryName != "emoji" {
+                            <span>✅</span>
+                        }
+                        if c.URL != "" {
+                            <img src={ c.URL } alt={ c.Emojy } />
+                        } else {
+                            { c.Emojy }
+                        }
+                        </li>
+                    }
+                </ul>
+            }
+        </div>
+    </div>
 }
diff --git a/plugins/emojy/stats_templ.go b/plugins/emojy/stats_templ.go
index cf4a812..4e81127 100644
--- a/plugins/emojy/stats_templ.go
+++ b/plugins/emojy/stats_templ.go
@@ -25,7 +25,7 @@ func (p *EmojyPlugin) emojyNav() templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<nav class=\"navbar navbar-expand-lg bg-body-tertiary\"><div class=\"container-fluid\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a class=\"nav-link\" href=\"/emojy/stats\">Stats</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"/emojy/list\">List</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"/emojy/new\">Upload</a></li></ul></div></nav>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<ul class=\"menu\"><li><a href=\"/emojy/stats\">Stats</a></li><li><a href=\"/emojy/list\">List</a></li><li><a href=\"/emojy/new\">Upload</a></li></ul>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -49,24 +49,32 @@ func (p *EmojyPlugin) statsIndex(emojy emojyMap) templ.Component {
 			templ_7745c5c3_Var2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"grid-container\"><div class=\"grid-x\"><div class=\"cell\"><h2>Emojy</h2></div></div><div class=\"grid-x\"><div class=\"cell\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		templ_7745c5c3_Err = p.emojyNav().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div class=\"cell\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		for categoryName, v := range emojy {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container\"><ul class=\"list-group list-group-flush\">")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<ul class=\"no-bullet\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			for _, c := range v {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<li class=\"list-group-item\">")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<li class=\"\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var3 string
 				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%d", c.Count))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `plugins/emojy/stats.templ`, Line: 29, Col: 44}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `plugins/emojy/stats.templ`, Line: 35, Col: 52}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 				if templ_7745c5c3_Err != nil {
@@ -112,7 +120,7 @@ func (p *EmojyPlugin) statsIndex(emojy emojyMap) templ.Component {
 					var templ_7745c5c3_Var4 string
 					templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(c.Emojy)
 					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `plugins/emojy/stats.templ`, Line: 38, Col: 29}
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `plugins/emojy/stats.templ`, Line: 44, Col: 37}
 					}
 					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 					if templ_7745c5c3_Err != nil {
@@ -124,11 +132,15 @@ func (p *EmojyPlugin) statsIndex(emojy emojyMap) templ.Component {
 					return templ_7745c5c3_Err
 				}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</ul></div>")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</ul>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		if !templ_7745c5c3_IsBuffer {
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
 		}
diff --git a/plugins/emojy/upload.templ b/plugins/emojy/upload.templ
index 0c46849..c386079 100644
--- a/plugins/emojy/upload.templ
+++ b/plugins/emojy/upload.templ
@@ -1,13 +1,30 @@
 package emojy
 
 templ (p *EmojyPlugin) uploadIndex() {
-    <div class="container">
-        <label>Passphrase</label>
-        <input type="text" name="password" placeholder="Password..."></input>
-        <label>File
-            <input type="file" />
-        </label>
-        <br />
-        <button hx-post="/emojy/upload">Submit</button>
+    <div class="grid-container">
+        <div class="grid-x">
+            <div class="cell">
+                <h2>Emojy</h2>
+            </div>
+        </div>
+        <div class="grid-x">
+            <div class="cell">
+                @p.emojyNav()
+            </div>
+        </div>
+        <div class="grid-x">
+            <div class="cell">
+                <label>Passphrase</label>
+                <input type="text" name="password" placeholder="Password..."></input>
+            </div>
+            <div class="cell">
+                <label>File
+                    <input type="file" />
+                </label>
+            </div>
+            <div class="cell">
+                <button class="button" hx-post="/emojy/upload">Submit</button>
+            </div>
+        </div>
     </div>
 }
diff --git a/plugins/emojy/upload_templ.go b/plugins/emojy/upload_templ.go
index 53b26be..de98377 100644
--- a/plugins/emojy/upload_templ.go
+++ b/plugins/emojy/upload_templ.go
@@ -23,7 +23,15 @@ func (p *EmojyPlugin) uploadIndex() templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container\"><label>Passphrase</label> <input type=\"text\" name=\"password\" placeholder=\"Password...\"> <label>File <input type=\"file\"></label><br><button hx-post=\"/emojy/upload\">Submit</button></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"grid-container\"><div class=\"grid-x\"><div class=\"cell\"><h2>Emojy</h2></div></div><div class=\"grid-x\"><div class=\"cell\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = p.emojyNav().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div class=\"grid-x\"><div class=\"cell\"><label>Passphrase</label> <input type=\"text\" name=\"password\" placeholder=\"Password...\"></div><div class=\"cell\"><label>File <input type=\"file\"></label></div><div class=\"cell\"><button hx-post=\"/emojy/upload\">Submit</button></div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
diff --git a/plugins/meme/meme_templ.go b/plugins/meme/meme_templ.go
index 842dd8f..77713f7 100644
--- a/plugins/meme/meme_templ.go
+++ b/plugins/meme/meme_templ.go
@@ -23,7 +23,7 @@ func (p *MemePlugin) index(all webResps) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<h2>Meme</h2><div class=\"grid-container\"><form><div class=\"grid-x grid-margin-x\"><div class=\"cell auto\"><input type=\"text\" name=\"name\" placeholder=\"Name...\"></div><div class=\"cell auto\"><input type=\"text\" name=\"url\" placeholder=\"URL...\"></div><div class=\"cell auto\"><textarea name=\"config\"></textarea></div><div class=\"cell small-2\"><button class=\"button\" hx-post=\"/meme/add\" hx-target=\"#newMemes\">Save</button></div></div></form><div id=\"newMemes\"></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"grid-container\"><h2>Meme</h2><form><div class=\"grid-x grid-margin-x\"><div class=\"cell auto\"><input type=\"text\" name=\"name\" placeholder=\"Name...\"></div><div class=\"cell auto\"><input type=\"text\" name=\"url\" placeholder=\"URL...\"></div><div class=\"cell auto\"><textarea name=\"config\"></textarea></div><div class=\"cell small-2\"><button class=\"button\" hx-post=\"/meme/add\" hx-target=\"#newMemes\">Save</button></div></div></form><div id=\"newMemes\"></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -147,7 +147,7 @@ func (p *MemePlugin) Edit(meme webResp) templ.Component {
 			templ_7745c5c3_Var5 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form><div class=\"grid-x\" id=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form><div class=\"grid-x grid-margin-x\" id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}