diff --git a/README.md b/README.md
index 2bc037b..3e5a453 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,16 @@ Indie Wiki Buddy is a browser extension that automatically notifies and redirect
 ![ES wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=ES%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesES.json)
 ![FI wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=FI%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesFI.json)
 ![FR wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=FR%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesFR.json)
+![HU wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=HU%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesHU.json)
 ![IT wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=IT%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesIT.json)
+![JA wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=JA%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesJA.json)
 ![KO wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=KO%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesKO.json)
 ![PL wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=PL%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesPL.json)
 ![PT wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=PT%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesPT.json)
 ![RU wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=RU%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesRU.json)
+![TH wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=TH%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesTH.json)
 ![TOK wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=TOK%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesTOK.json)
+![UK wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=UK%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesUK.json)
 ![ZH wikis](https://img.shields.io/badge/dynamic/json?style=flat-square&label=ZH%20wikis&query=length&url=https%3A%2F%2Fraw.githubusercontent.com%2FKevinPayravi%2Findie-wiki-buddy%2Fmain%2Fdata%2FsitesZH.json)
 
 ![Mozilla Add-on](https://img.shields.io/amo/v/indie-wiki-buddy?style=flat-square&color=%23cb553f&label=firefox%20version&logo=firefox)
diff --git a/pages/popup/index.html b/pages/popup/index.html
index 0e1e4a8..11342b7 100644
--- a/pages/popup/index.html
+++ b/pages/popup/index.html
@@ -163,8 +163,12 @@
     }
 
     #links {
+      display: flex;
+      flex-wrap: wrap;
+      column-gap: 1.5em;
       background-color: #ceeaff;
       padding: .5rem 1rem;
+      white-space: nowrap;
     }
 
     /* SETTINGS */
@@ -198,6 +202,10 @@
       gap: .5em;
     }
 
+    #breeezwikiLearnMore {
+      white-space: nowrap;
+    }
+
     #breezewikiHost {
       display: none;
       padding: 0 0 0 1rem;
@@ -273,14 +281,10 @@
   </div>
   <div id="links">
     <a href="../guide/index.html" target="_blank">Guide</a>
-    &nbsp;&nbsp;&nbsp;
     <a href="https://getindie.wiki" target="_blank">Website</a>
-    &nbsp;&nbsp;&nbsp;
     <a href="https://getindie.wiki/changelog/" target="_blank">Changelog</a>
-    &nbsp;&nbsp;&nbsp;
-    <a href="https://getindie.wiki/#submit" target="_blank">Submit&nbsp;a&nbsp;Wiki</a>
-    &nbsp;&nbsp;&nbsp;
-    <a href="https://github.com/KevinPayravi/indie-wiki-buddy" target="_blank">Source&nbsp;Code</a>
+    <a href="https://getindie.wiki/#submit" target="_blank">Submit a Wiki</a>
+    <a href="https://github.com/KevinPayravi/indie-wiki-buddy" target="_blank">Source Code</a>
   </div>
   <div id="notificationBannerContainer">
     <span id="notificationBannerOpera">
@@ -377,8 +381,8 @@
       </fieldset>
       <fieldset id="breezewikiSettings">
         <legend>
-          <span aria-hidden="true">༄</span> BreezeWiki alternative frontend for Fandom (<a href="https://breezewiki.com/"
-            target="_blank">learn&nbsp;more</a>)
+          <span aria-hidden="true">༄</span> BreezeWiki alternative frontend for Fandom (<a id="breeezwikiLearnMore" href="https://breezewiki.com/"
+            target="_blank">learn more</a>)
         </legend>
         <div role="radiogroup">
           <div class="radioGroup vertical">
diff --git a/pages/settings/index.html b/pages/settings/index.html
index 2e84e52..47c8c97 100644
--- a/pages/settings/index.html
+++ b/pages/settings/index.html
@@ -135,8 +135,12 @@
     }
 
     #links {
+      display: flex;
+      flex-wrap: wrap;
+      column-gap: 1.5em;
       background-color: #e5f4ff;
       padding: .5rem 1rem;
+      white-space: nowrap;
     }
 
     #firstInstallInfo {
@@ -180,6 +184,11 @@
       border-top: 1px solid #005799;
     }
 
+    #notificationBannerReviewLinks {
+      display: flex;
+      column-gap: 1em;
+    }
+
     /* SETTINGS SECTION */
     .options {
       box-sizing: border-box;
@@ -217,6 +226,10 @@
       display: inline-block;
     }
 
+    #breeezwikiLearnMore {
+      white-space: nowrap;
+    }
+
     #breezewikiHost {
       display: none;
       padding: 0 0 0 1rem;
@@ -265,9 +278,17 @@
       gap: 5px;
     }
 
-    #langSelectContainer, #filterInputContainer {
-      margin: 1em 0;
-      text-align: center;
+    #wikiFiltersContainer {
+      display: grid;
+      gap: 0.5em;
+      grid-template-columns: 1fr 1fr;
+      margin: 1em auto;
+      width: 30em;
+    }
+
+    #wikiFiltersContainer div {
+      text-align: right;
+      align-self: end;
     }
 
     .toggles {
@@ -482,14 +503,10 @@
     </div>
     <div id="links">
       <a href="../guide/index.html">Guide</a>
-      &nbsp;&nbsp;&nbsp;
       <a href="https://getindie.wiki" target="_blank">Website</a>
-      &nbsp;&nbsp;&nbsp;
       <a href="https://getindie.wiki/changelog/" target="_blank">Changelog</a>
-      &nbsp;&nbsp;&nbsp;
-      <a href="https://getindie.wiki/#submit" target="_blank">Submit&nbsp;a&nbsp;Wiki</a>
-      &nbsp;&nbsp;&nbsp;
-      <a href="https://github.com/KevinPayravi/indie-wiki-buddy" target="_blank">Source&nbsp;Code</a>
+      <a href="https://getindie.wiki/#submit" target="_blank">Submit a Wiki</a>
+      <a href="https://github.com/KevinPayravi/indie-wiki-buddy" target="_blank">Source Code</a>
     </div>
     <div id="notificationBannerContainer">
       <span id="notificationBannerOpera">
@@ -500,15 +517,16 @@
       </span>
       <span id="notificationBannerReview">
         Enjoying Indie Wiki Buddy? Please leave a review!
+        <div id="notificationBannerReviewLinks">
+          <a id="reviewReminderChromeLink" target="_blank"
+            href="https://chrome.google.com/webstore/detail/indie-wiki-buddy/fkagelmloambgokoeokbpihmgpkbgbfm">Chrome</a>
+          <div>|</div>
+          <a id="reviewReminderFirefoxLink" target="_blank"
+            href="https://addons.mozilla.org/en-US/firefox/addon/indie-wiki-buddy/">Firefox</a>
+          <div>|</div>
+          <a id="reviewReminderHideLink" href="#">Hide this message</a>
+        </div>
         <br />
-        <a id="reviewReminderChromeLink" target="_blank"
-          href="https://chrome.google.com/webstore/detail/indie-wiki-buddy/fkagelmloambgokoeokbpihmgpkbgbfm">Chrome</a>
-        &nbsp;&nbsp;|&nbsp;&nbsp;
-        <a id="reviewReminderFirefoxLink" target="_blank"
-          href="https://addons.mozilla.org/en-US/firefox/addon/indie-wiki-buddy/">Firefox</a>
-        &nbsp;&nbsp;|&nbsp;&nbsp;
-        <a id="reviewReminderHideLink" href="#">Hide this message</a>
-        <br /><br />
         Having issues or ideas for improvement? Please <a target="_blank" href="https://getindie.wiki/#contact">contact
           me</a>!
       </span>
@@ -587,8 +605,8 @@
         </fieldset>
         <fieldset id="breezewikiSettings">
           <legend>
-            <span aria-hidden="true">༄</span> BreezeWiki alternative frontend for Fandom (<a href="https://breezewiki.com/"
-              target="_blank">learn&nbsp;more</a>)
+            <span aria-hidden="true">༄</span> BreezeWiki alternative frontend for Fandom (<a id="breeezwikiLearnMore" href="https://breezewiki.com/"
+              target="_blank">learn more</a>)
           </legend>
           <div role="radiogroup">
             <div class="radioGroup vertical">
@@ -659,8 +677,8 @@
             </div>
           </div>
         </fieldset>
-        <div id="langSelectContainer">
-          Filter wikis by language:&nbsp;
+        <div id="wikiFiltersContainer">
+          <div id="langSelectCaption">Filter wikis by language:</div>
           <select name="lang" id="langSelect">
             <option value="ALL" selected>All languages</option>
             <option value="DE">German / Deutsch (DE)</option>
@@ -679,13 +697,9 @@
             <option value="TOK">Toki Pona (TOK)</option>
             <option value="UK">Ukrainian / Українська (UK)</option>
             <option value="ZH">Chinese / 中文 (ZH)</option>
-          </select>
-        </div>
-        <div id="filterInputContainer">
-          <label>
-            Filter wikis by name:
-            <input id="filterInput" type="text" name="filterInput" placeholder="Enter wiki name..." />
-          </label>
+            </select>
+          <div id="filterInputCaption">Filter wikis by name:</div>
+          <input id="filterInput" type="text" name="filterInput" placeholder="Enter wiki name..." />
         </div>
         <div class="sticky">
           <div id="togglesColumnLabels" class="toggles">