diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html
index 98e9fca6..31083704 100644
--- a/src/pages/options/general/general.html
+++ b/src/pages/options/general/general.html
@@ -108,246 +108,246 @@
     </div>
   </section>
 
-  <section class="option-block">
-    <div class="some-block option-block">
-      <h4>Theme</h4>
-      <select id="theme">
-        <option value="DEFAULT">System</option>
-        <option value="light">Light</option>
-        <option value="dark">Dark</option>
-      </select>
-    </div>
-
-    <div class="some-block option-block">
-      <h4>Apply Theme to sites</h4>
-      <input id="apply-theme-to-sites" type="checkbox" checked />
-    </div>
-
-    <div class="some-block option-block">
-      <h4>Always use Preferred Instances</h4>
-      <input id="always-use-preferred" type="checkbox" checked />
-    </div>
-
-    <div class="some-block option-block">
-      <h4>Auto Redirect of offline instances</h4>
-      <input id="auto-redirect" type="checkbox" checked />
-    </div>
-
-    <div class="some-block option-block">
-      <h4>Exceptions</h4>
-    </div>
-
-    <form id="custom-exceptions-instance-form">
+  <section class="option-block general">
+    <div>
       <div class="some-block option-block">
-        <div class="some-block" style="padding:0;">
-          <input id="exceptions-custom-instance" placeholder="https://www.google.com" type="url" />
-          &nbsp;
-          <select id="exceptions-custom-instance-type">
-            <option value="url">URL</option>
-            <option value="regex">Regex</option>
-          </select>
-          &nbsp;
-        </div>
-        <button type="submit" class="add" id="exceptions-add-instance">
-          <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
-            <path d="M0 0h24v24H0V0z" fill="none" />
-            <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-          </svg>
-        </button>
+        <h4>Theme</h4>
+        <select id="theme">
+          <option value="DEFAULT">System</option>
+          <option value="light">Light</option>
+          <option value="dark">Dark</option>
+        </select>
       </div>
-    </form>
-    <div class="checklist" id="exceptions-custom-checklist"></div>
 
-    <div class="buttons buttons-inline">
-      <a class="button button-inline" id="update-instances">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
-          <path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" />
-        </svg>
-        Update Instances
-      </a>
-      &nbsp; &nbsp;
-      <label for="import-settings" class="button button-inline">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
-          <path
-            d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" />
-        </svg>&nbsp;
-        Import Settings
-        <input type="file" class="button button-inline" style="display:none;" id="import-settings">
-      </label>
-      &nbsp; &nbsp;
-      <a class="button button-inline" id="export-settings">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
-          <path
-            d="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z" />
-        </svg>&nbsp;
-        Export Settings
-      </a>
-      &nbsp; &nbsp;
-      <a class="button button-inline" id="reset-settings">
-        <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24"
-          width="24px" fill="currentColor">
-          <g>
+      <div class="some-block option-block">
+        <h4>Apply Theme to sites</h4>
+        <input id="apply-theme-to-sites" type="checkbox" checked />
+      </div>
+
+      <div class="some-block option-block">
+        <h4>Always use Preferred Instances</h4>
+        <input id="always-use-preferred" type="checkbox" checked />
+      </div>
+
+      <div class="some-block option-block">
+        <h4>Auto Redirect of offline instances</h4>
+        <input id="auto-redirect" type="checkbox" checked />
+      </div>
+
+      <div class="some-block option-block">
+        <h4>Exceptions</h4>
+      </div>
+
+      <form id="custom-exceptions-instance-form">
+        <div class="some-block option-block">
+          <div class="some-block" style="padding:0;">
+            <input id="exceptions-custom-instance" placeholder="https://www.google.com" type="url" />
+            &nbsp;
+            <select id="exceptions-custom-instance-type">
+              <option value="url">URL</option>
+              <option value="regex">Regex</option>
+            </select>
+            &nbsp;
+          </div>
+          <button type="submit" class="add" id="exceptions-add-instance">
+            <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M0 0h24v24H0V0z" fill="none" />
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist" id="exceptions-custom-checklist"></div>
+
+      <div class="buttons buttons-inline">
+        <a class="button button-inline" id="update-instances">
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" />
+          </svg>
+          Update Instances
+        </a>
+        &nbsp; &nbsp;
+        <label for="import-settings" class="button button-inline">
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <path
+              d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" />
+          </svg>&nbsp;
+          Import Settings
+          <input type="file" class="button button-inline" style="display:none;" id="import-settings">
+        </label>
+        &nbsp; &nbsp;
+        <a class="button button-inline" id="export-settings">
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <path
+              d="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z" />
+          </svg>&nbsp;
+          Export Settings
+        </a>
+        &nbsp; &nbsp;
+        <a class="button button-inline" id="reset-settings">
+          <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24"
+            width="24px" fill="currentColor">
             <g>
-              <path
-                d="M12,5V2L8,6l4,4V7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02c3.95-0.49,7-3.85,7-7.93C20,8.58,16.42,5,12,5z" />
-              <path
-                d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z" />
+              <g>
+                <path
+                  d="M12,5V2L8,6l4,4V7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02c3.95-0.49,7-3.85,7-7.93C20,8.58,16.42,5,12,5z" />
+                <path
+                  d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z" />
+              </g>
             </g>
-          </g>
-        </svg>
-        Reset Settings
-      </a>
+          </svg>
+          Reset Settings
+        </a>
+      </div>
+
     </div>
+    <div id="customize-popup">
+      <div class="some-block option-block">
+        <h4>Customize Popup</h4>
+      </div>
 
-    <hr>
-
-    <div class="some-block option-block">
-      <h4>Customize Popup</h4>
-    </div>
-
-    <div class="checklist-popup" id="popup-frontends-checklist">
-      <div>
+      <div class="checklist-popup" id="popup-frontends-checklist">
         <div>
-          <img src="../../../assets/images/youtube-icon.png">
-          YouTube
+          <div>
+            <img src="../../../assets/images/youtube-icon.png">
+            YouTube
+          </div>
+          <input type="checkbox" id="youtube" />
         </div>
-        <input type="checkbox" id="youtube" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/youtube-music-icon.png">
-          YoutubeMusic
+          <div>
+            <img src="../../../assets/images/youtube-music-icon.png">
+            YoutubeMusic
+          </div>
+          <input type="checkbox" id="youtubeMusic" />
         </div>
-        <input type="checkbox" id="youtubeMusic" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/twitter-icon.png">
-          Twitter
+          <div>
+            <img src="../../../assets/images/twitter-icon.png">
+            Twitter
+          </div>
+          <input type="checkbox" id="twitter" />
         </div>
-        <input type="checkbox" id="twitter" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/instagram-icon.png">
-          Instagram
+          <div>
+            <img src="../../../assets/images/instagram-icon.png">
+            Instagram
+          </div>
+          <input type="checkbox" id="instagram" />
         </div>
-        <input type="checkbox" id="instagram" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/tiktok-icon.png">
-          TikTok
+          <div>
+            <img src="../../../assets/images/tiktok-icon.png">
+            TikTok
+          </div>
+          <input type="checkbox" id="tikTok" />
         </div>
-        <input type="checkbox" id="tikTok" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/imgur-icon.png">
-          Imgur
+          <div>
+            <img src="../../../assets/images/imgur-icon.png">
+            Imgur
+          </div>
+          <input type="checkbox" id="imgur" />
         </div>
-        <input type="checkbox" id="imgur" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/reddit-icon.png">
-          Reddit
+          <div>
+            <img src="../../../assets/images/reddit-icon.png">
+            Reddit
+          </div>
+          <input type="checkbox" id="reddit" />
         </div>
-        <input type="checkbox" id="reddit" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/pixiv-icon.svg">
-          Pixiv
+          <div>
+            <img src="../../../assets/images/pixiv-icon.svg">
+            Pixiv
+          </div>
+          <input type="checkbox" id="pixiv" />
         </div>
-        <input type="checkbox" id="pixiv" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/spotify-icon.png">
-          Spotify
+          <div>
+            <img src="../../../assets/images/spotify-icon.png">
+            Spotify
+          </div>
+          <input type="checkbox" id="spotify" />
         </div>
-        <input type="checkbox" id="spotify" />
-      </div>
-      <div>
         <div>
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-            <path d="M0 0h24v24H0V0z" fill="none" />
-            <path
-              d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" />
-          </svg>
-          Search
+          <div>
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+              <path d="M0 0h24v24H0V0z" fill="none" />
+              <path
+                d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" />
+            </svg>
+            Search
+          </div>
+          <input type="checkbox" id="search" />
         </div>
-        <input type="checkbox" id="search" />
-      </div>
-      <div>
         <div>
-          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
-            <path d="M0 0h24v24H0V0z" fill="none" />
-            <path
-              d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" />
-          </svg>
-          Translate
+          <div>
+            <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+              <path d="M0 0h24v24H0V0z" fill="none" />
+              <path
+                d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" />
+            </svg>
+            Translate
+          </div>
+          <input type="checkbox" id="translate" />
         </div>
-        <input type="checkbox" id="translate" />
-      </div>
-      <div>
         <div>
-          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
-            <path d="M0 0h24v24H0V0z" fill="none" />
-            <path
-              d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z" />
-          </svg>
-          Maps
+          <div>
+            <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+              <path d="M0 0h24v24H0V0z" fill="none" />
+              <path
+                d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z" />
+            </svg>
+            Maps
+          </div>
+          <input type="checkbox" id="maps" />
         </div>
-        <input type="checkbox" id="maps" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/wikipedia-icon.svg">
-          Wikipedia
+          <div>
+            <img src="../../../assets/images/wikipedia-icon.svg">
+            Wikipedia
+          </div>
+          <input type="checkbox" id="wikipedia" />
         </div>
-        <input type="checkbox" id="wikipedia" />
-      </div>
-      <div>
         <div>
-          <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ -->
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
-            <circle cx="500" cy="500" r="500" />
-            <ellipse ry="475" rx="250" cy="501" cx="1296" />
-            <ellipse cx="1682" cy="502" rx="88" ry="424" />
-          </svg>
-          Medium
+          <div>
+            <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ -->
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
+              <circle cx="500" cy="500" r="500" />
+              <ellipse ry="475" rx="250" cy="501" cx="1296" />
+              <ellipse cx="1682" cy="502" rx="88" ry="424" />
+            </svg>
+            Medium
+          </div>
+          <input type="checkbox" id="medium" />
         </div>
-        <input type="checkbox" id="medium" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/peertube-icon.svg">
-          Peertube
+          <div>
+            <img src="../../../assets/images/peertube-icon.svg">
+            Peertube
+          </div>
+          <input type="checkbox" id="peertube" />
         </div>
-        <input type="checkbox" id="peertube" />
-      </div>
-      <div>
         <div>
-          <img src="../../../assets/images/lbry-icon.png">
-          LBRY/Odysee
+          <div>
+            <img src="../../../assets/images/lbry-icon.png">
+            LBRY/Odysee
+          </div>
+          <input type="checkbox" id="lbry" />
         </div>
-        <input type="checkbox" id="lbry" />
-      </div>
-      <div>
         <div>
-          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
-            <path
-              d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z" />
-          </svg>
-          Send Files
+          <div>
+            <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+              <path
+                d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z" />
+            </svg>
+            Send Files
+          </div>
+          <input type="checkbox" id="sendTargets" />
         </div>
-        <input type="checkbox" id="sendTargets" />
       </div>
     </div>
-    <hr>
-
   </section>
 
   <script type="module" src="../init.js"></script>
diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css
index 5417242e..17949b64 100644
--- a/src/pages/stylesheets/styles.css
+++ b/src/pages/stylesheets/styles.css
@@ -95,7 +95,7 @@ a {
 section.links a {
   display: flex;
   align-items: center;
-  font-size: 24px;
+  font-size: 18px;
   text-decoration: none;
   color: white;
   transition: 0.1s;
@@ -190,8 +190,8 @@ div.option-block h1 {
 }
 
 div.some-block input[type="checkbox"] {
-  width: 48px;
-  height: 25px;
+  width: 46px;
+  height: 23px;
   background-color: var(--light-grey);
   border-radius: 50px;
   transition: .4s;
@@ -205,13 +205,12 @@ div.some-block input[type="checkbox"]:checked {
 div.some-block input[type="checkbox"]::before {
   content: "";
   display: inline-block;
-  width: 20px;
-  height: 20px;
+  width: 18px;
+  height: 18px;
   box-sizing: border-box;
   position: relative;
   top: 2.5px;
-  left: 4px;
-  height: 20px;
+  left: 3.5px;
   background-color: white;
   border-radius: 50%;
   transition: .3s;
@@ -378,4 +377,20 @@ body.light-theme textarea:focus {
 
 body.light-theme a {
   color: black;
+}
+
+section.general {
+  display: flex;
+  flex-wrap: wrap;
+  margin-right: 0;
+  width: 100%;
+  justify-content: space-between;
+}
+
+section.general div {
+  margin-right: 20px;
+}
+
+#customize-popup {
+  width: 250px;
 }
\ No newline at end of file