diff --git a/README.md b/README.md
index 745b5715..07ffa7d8 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Cheat Sheet for [Factorio](https://www.factorio.com/): *"A compendium of the mos
 
 If you would like to contribute to the cheat sheet code/content, see `contributing.md`
 
-![Factorio Cheat Sheet](src/assets/icons/factorio-cheat-sheet-splash.png)
+![Factorio Cheat Sheet](src/assets/icons/factorio-cheat-sheet-splash.webp)
 
 ## Deployments [![Build Status](https://travis-ci.com/deniszholob/factorio-cheat-sheet.svg?branch=master)](https://travis-ci.com/deniszholob/factorio-cheat-sheet)
 
@@ -18,10 +18,10 @@ For anyone who is doing development work with Angular, I hope this project helps
 # Support Me
 If you find the cheat sheet or the source code useful, consider supporting me on Patreon.
 
-[![button](https://c5.patreon.com/external/logo/downloads_wordmark_white_on_coral.png)](https://www.patreon.com/deniszholob)
+<img src="https://c5.patreon.com/external/logo/downloads_wordmark_white_on_coral.png" width="260" />
 
 # Screenshots
 
-![Factorio Cheat Sheet Mobile Website](screenshots/factorio-sheat-sheet-home-screen-500.png)
+![Factorio Cheat Sheet Mobile Website](screenshots/factorio-sheat-sheet-home-screen-phone.webp)
 
-![Factorio Cheat Sheet Desktop Website](screenshots/factorio-cheat-sheet.png)
+![Factorio Cheat Sheet Desktop Website](screenshots/factorio-sheat-sheet-screen-pc.webp)
diff --git a/screenshots/factorio-cheat-sheet.png b/screenshots/factorio-cheat-sheet.png
deleted file mode 100644
index a5300674..00000000
Binary files a/screenshots/factorio-cheat-sheet.png and /dev/null differ
diff --git a/screenshots/factorio-sheat-sheet-home-screen-500.png b/screenshots/factorio-sheat-sheet-home-screen-500.png
deleted file mode 100644
index 42ee9a1f..00000000
Binary files a/screenshots/factorio-sheat-sheet-home-screen-500.png and /dev/null differ
diff --git a/screenshots/factorio-sheat-sheet-home-screen-phone.webp b/screenshots/factorio-sheat-sheet-home-screen-phone.webp
new file mode 100644
index 00000000..e9d8c42c
Binary files /dev/null and b/screenshots/factorio-sheat-sheet-home-screen-phone.webp differ
diff --git a/screenshots/factorio-sheat-sheet-screen-pc.webp b/screenshots/factorio-sheat-sheet-screen-pc.webp
new file mode 100644
index 00000000..8e3d41f1
Binary files /dev/null and b/screenshots/factorio-sheat-sheet-screen-pc.webp differ
diff --git a/src/app/shared/app-settings.ts b/src/app/shared/app-settings.ts
index 17a39b94..91ff178c 100644
--- a/src/app/shared/app-settings.ts
+++ b/src/app/shared/app-settings.ts
@@ -15,7 +15,7 @@ export const APP_SETTINGS: AppInfo = {
         name: 'Github Source',
         url: 'https://github.com/deniszholob/factorio-cheat-sheet',
     },
-    data_version: '0.18.45',
+    data_version: '0.18.47',
     // languages: ['en-US'],
     links: {
         getLocalImagePath: function (imageName) {
diff --git a/src/app/shared/cheat-sheet/cheat-sheet.component.html b/src/app/shared/cheat-sheet/cheat-sheet.component.html
index d0db60ff..77577a4d 100644
--- a/src/app/shared/cheat-sheet/cheat-sheet.component.html
+++ b/src/app/shared/cheat-sheet/cheat-sheet.component.html
@@ -2,7 +2,7 @@
     <div class="card-header" (click)="cheatSheet?.toggleCollapse()">
         <a href="#{{cheatSheet?.id}}">
             <app-factorio-icon [icon]="cheatSheet?.icon"></app-factorio-icon>
-            <h5 class="card-title">{{cheatSheet?.title}}</h5>
+            <h3 class="card-title">{{cheatSheet?.title}}</h3>
         </a>
         <button *ngIf="cheatSheet?.isCollapsed" class="card-collapse" aria-label="Expand">
             <i class="fa fa-plus" aria-hidden="true" title="Expand"></i>
diff --git a/src/app/views/cheat-sheets/balancers/balancers.component.html b/src/app/views/cheat-sheets/balancers/balancers.component.html
index ccd07f4d..f6eb5254 100644
--- a/src/app/views/cheat-sheets/balancers/balancers.component.html
+++ b/src/app/views/cheat-sheets/balancers/balancers.component.html
@@ -1,5 +1,5 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
-    <p class="card-text">
+    <p>
         <strong><a href="https://wiki.factorio.com/Balancer_mechanics">Balancers</a></strong> are used to evenly
         distribute items over multiple belts, commonly used at ore patches or the <a href="https://wiki.factorio.com/Tutorial:Main_bus#Split-off">Main Bus</a>.
     </p>
diff --git a/src/app/views/cheat-sheets/belt-throughput/belt-throughput.component.html b/src/app/views/cheat-sheets/belt-throughput/belt-throughput.component.html
index 568d42a4..5db9f76d 100644
--- a/src/app/views/cheat-sheets/belt-throughput/belt-throughput.component.html
+++ b/src/app/views/cheat-sheets/belt-throughput/belt-throughput.component.html
@@ -1,33 +1,21 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
-    <p class="card-text">
-        <strong>
-            <a href="https://wiki.factorio.com/Transport_belt" target="_blank" rel="noopener">
-                Transport Belt
-            </a> Throughput
-        </strong> - Items per second (i/s) passed over one belt tile.
-        <br>
-        <strong>Transport Belt Density</strong> - Maximum items that fit in one tile:
-        <strong>{{ sheetData?.belt_density }} items</strong> for all belts.
-    </p>
-    <p class="card-text">
-        <kbd class="txt-factorio-red">Red belt</kbd> is
-        <strong>{{ sheetData?.belt_info[1].throughput / sheetData?.belt_info[0].throughput }}x</strong> faster than
-        <kbd class="txt-factorio-yellow">Yellow belt</kbd>
-        <br>
-        <kbd class="txt-factorio-blue">Blue belt</kbd> is
-        <strong>{{ sheetData?.belt_info[2].throughput / sheetData?.belt_info[0].throughput }}x</strong> faster than
-        <kbd class="txt-factorio-yellow">Yellow belt</kbd>.
-    </p>
-    <div class="card-text">
-        See <a href="https://wiki.factorio.com/Belt_transport_system" target="_blank" rel="noopener">
-            Belt Transport System
-        </a> for all relevant belt information.
-    </div>
-
-    <hr>
-
     <div class="row align-items-center">
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-7">
+            <p>
+                See <a href="https://wiki.factorio.com/Belt_transport_system" target="_blank" rel="noopener">
+                    Belt Transport System
+                </a> for all relevant belt information.
+            </p><p>
+                <strong>
+                    <a href="https://wiki.factorio.com/Transport_belt" target="_blank" rel="noopener">
+                        Transport Belt
+                    </a> Throughput
+                </strong> - Items per second (i/s) passed over one belt tile.
+                <br>
+                <strong>Transport Belt Density</strong> - Maximum items that fit in one tile:
+                <strong>{{ sheetData?.belt_density }} items</strong> for all belts.
+            </p>
+
             <table class="table table-sm table-hover fixed-width">
                 <thead class="text-center">
                     <tr>
@@ -49,9 +37,44 @@
             </table>
         </div>
 
-        <div class="col-12 col-md-6 text-center">
+        <div class="col-12 col-md-5 text-center">
             <p>All belts can hold up to <strong>{{ sheetData?.belt_density }} items</strong> on each tile.</p>
             <img src="{{APP_SETTINGS.links.getLocalImagePath('belt-signal-circuit.webp')}}" class="img-fluid rounded" alt="Transport Belt Signal" title="Transport Belt Signal">
         </div>
     </div>
+
+<br>
+    <p>
+        Its common to stack belts to form a <a href="https://wiki.factorio.com/Tutorial:Main_bus" target="_blank" rel="noopener">Main Bus</a>, which you can learn more with
+        <a href="https://www.youtube.com/watch?v=e9LSMqCRsd0&list=PLwehwVVQirAep2XwjX1IoJR4XIqU4eUCH&index=2" target="_blank" rel="noopener">Xterminator</a>,
+        <a href="https://www.youtube.com/watch?v=-kOxTtgHssk&list=PLnIE0W-m629dSJPPEETVY71CQhOfZ6r7W&index=8" target="_blank" rel="noopener">JDplays</a> and
+        <a href="https://www.youtube.com/watch?v=ErdHbEgJG58&list=PLV3rF--heRVu2xlDGZiRbdb7nbwzM9Vyz&index=2" target="_blank" rel="noopener">Nilaus</a>
+    </p>
+    <div class="row align-items-center">
+        <div class="col-12 align-items-center text-center">
+            <!-- <strong>Main Bus</strong> <br> -->
+            <a href="{{APP_SETTINGS.links.getLocalImagePath('bus.webp')}}" target="_blank" rel="noopener">
+                <img src="{{APP_SETTINGS.links.getLocalImagePath('bus.webp')}}" class="img-fluid rounded limit-img-height" alt="Main Bus" title="Main Bus">
+            </a>
+        </div>
+    </div>
+
+<br>
+
+    <div class="row align-items-center justify-content-around">
+        <div class="col-12 col-sm-6 col-lg-4 col-print-4 text-center">
+            <strong>Underground belts can be side loaded</strong><br>
+            <img src="{{APP_SETTINGS.links.getLocalImagePath('belt-tip-side-load.webp')}}" class="img-fluid rounded limit-img-height" alt="Side Load Underground" title="Side Load Underground">
+        </div>
+        <div class="col-12 col-sm-6 col-lg-4 col-print-4 text-center">
+            <strong>Splitters can filter items</strong><br>
+            <img src="{{APP_SETTINGS.links.getLocalImagePath('belt-tip-filter.webp')}}" class="img-fluid rounded limit-img-height" alt="Splitter Filter" title="Splitter Filter">
+        </div>
+        <div class="col-12 col-sm-6 col-lg-4 col-print-4 text-center">
+            <strong>Belts can be woven</strong><br>
+            <img src="{{APP_SETTINGS.links.getLocalImagePath('belt-weaving.webp')}}" class="img-fluid rounded limit-img-height" alt="Splitter Filter" title="Splitter Filter">
+        </div>
+    </div>
+
+
 </app-cheat-sheet>
diff --git a/src/app/views/cheat-sheets/common-ratios/common-ratios.component.html b/src/app/views/cheat-sheets/common-ratios/common-ratios.component.html
index 32d3fd76..7f5b141e 100644
--- a/src/app/views/cheat-sheets/common-ratios/common-ratios.component.html
+++ b/src/app/views/cheat-sheets/common-ratios/common-ratios.component.html
@@ -1,9 +1,9 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
 
-    <p class="card-text">
-        <strong>Description: </strong> First Item represents the type of machine
+    <p>
+        <strong>Description: </strong> First item represents the type of machine
         thats expected to assemble the following components.
-        <br> Following items represent the amount of machines needed making them.
+        <br> Following items represent the amount of <strong>machines</strong> needed making them.
         If there is no machine mixing (assemblers/chemical plants/furnaces)
         then ratios stay the same b/w assembly tiers.
         <br>
@@ -19,10 +19,11 @@
         </span>
     </p>
 
-    <p class="card-text">
+    <p>
         <strong>For example:</strong> To make rails,
         the right ratio is 1 iron stick assembler feeding 2 rail assemblers.
         <br> Using the level 3 assemblers you can produce 10 rails every second.
+        <br>See <a href="#links">Links</a> for blueprints and calculators
     </p>
 
     <div class="row">
@@ -81,7 +82,7 @@
     </div>
 
     <hr>
-    <h5 id="rocket">Rocket Components</h5>
+    <h3 id="rocket">Rocket Components</h3>
     <div class="row align-items-center">
         <p class="col-12 col-sm-4 text-center">
             <!-- <span class="text-muted">{{ sheetData?.rocketComponentsRatioNoSatellite?.name }}</span><br> -->
diff --git a/src/app/views/cheat-sheets/fluid-wagon-transfer/fluid-wagon-transfer.component.html b/src/app/views/cheat-sheets/fluid-wagon-transfer/fluid-wagon-transfer.component.html
index 1560993c..2845f20a 100644
--- a/src/app/views/cheat-sheets/fluid-wagon-transfer/fluid-wagon-transfer.component.html
+++ b/src/app/views/cheat-sheets/fluid-wagon-transfer/fluid-wagon-transfer.component.html
@@ -16,6 +16,7 @@
                     <a href="https://forums.factorio.com/viewtopic.php?f=18&t=19851" target="_blank" rel="noopener">fluid/s</a>
                     (offshore pump rate), place <a href="https://forums.factorio.com/viewtopic.php?f=5&t=46030">18 pipes between pumps</a>.
                 </li>
+                <li>Using underground pipes counts as less entities then if straight pipe for same distance.</li>
                 <li>
                     Fluid wagons can hold {{sheetData?.storageTankSize | number}} units of fluids which is equal to {{sheetData?.fluidWagonSize / sheetData?.storageTankSize}}
                     <a href="https://wiki.factorio.com/Storage_tank" target="_blank" rel="noopener">Storage Tanks</a>.
@@ -68,7 +69,7 @@
 
     <div class="row align-items-center justify-content-around">
         <div class="col text-center col-print-3">
-            <span><strong>Tanker-Pump Alignment</strong></span><br>
+            <span><strong>Tanker-Pump Alignment <a href="#note-alignment">*</a></strong></span><br>
             <video autoplay loop muted src="{{APP_SETTINGS.links.getLocalImagePath('fluid-wagon-alignment.webm')}}" class="img-fluid rounded" alt="Tanker-Pump Alignment" title="Tanker-Pump Alignment"></video>
         </div>
         <br>
@@ -82,6 +83,7 @@
             <video autoplay loop muted src="{{APP_SETTINGS.links.getLocalImagePath('fluid-transfer-rate-comparison.webm')}}" class="img-fluid rounded" alt="Transfer Rate Comparison" title="Transfer Rate Comparison"></video>
         </div>
     </div>
+    <p id="note-alignment">*Trains snap into position when placed at train stations.</p>
 
     <hr>
 
diff --git a/src/app/views/cheat-sheets/inserter-capacity-bonus/inserter-capacity-bonus.component.html b/src/app/views/cheat-sheets/inserter-capacity-bonus/inserter-capacity-bonus.component.html
index b3645868..84935804 100644
--- a/src/app/views/cheat-sheets/inserter-capacity-bonus/inserter-capacity-bonus.component.html
+++ b/src/app/views/cheat-sheets/inserter-capacity-bonus/inserter-capacity-bonus.component.html
@@ -1,6 +1,6 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
 
-    <p class="card-text">
+    <p>
         <strong><a href="https://wiki.factorio.com/Inserter_capacity_bonus_(research)" target="_blank" rel="noopener">Inserter capacity research</a></strong>
         is used to increase the stack size of the inserters.
     </p>
diff --git a/src/app/views/cheat-sheets/inserter-throughput/inserter-throughput.component.html b/src/app/views/cheat-sheets/inserter-throughput/inserter-throughput.component.html
index eb4abc02..0237f892 100644
--- a/src/app/views/cheat-sheets/inserter-throughput/inserter-throughput.component.html
+++ b/src/app/views/cheat-sheets/inserter-throughput/inserter-throughput.component.html
@@ -1,17 +1,18 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
-    <p class="card-text">
+    <p>
         <strong><a href="https://wiki.factorio.com/Inserters#Inserter_Throughput" target="_blank" rel="noopener">Inserter Throughput</a></strong> - Items
         per second (i/s) moved by the inserter between targets (chests, belts, assemblers, trains, etc...)
-    </p>
-    <p class="card-text">
+        <br>
         <strong><a href="https://wiki.factorio.com/Inserter_capacity_bonus_(research)" target="_blank" rel="noopener">Inserter capacity research</a></strong> is used to increase the throughput.
     </p>
-    <p>The inserter throughput displayed in the tables below could be used to calculate the exact number of inserters needed
-        for your task.</p>
-
-    <p><kbd>
-        Inserters Required = (Target Item Rate) / (Inserter Throughput)
-    </kbd></p>
+    <p>
+        The inserter throughput displayed in the tables below could be used to calculate
+        the exact number of inserters needed for your task.
+        <br>
+        <kbd>
+            Inserters Required = (Target Item Rate) / (Inserter Throughput)
+        </kbd>
+    </p>
 
     <table class="table table-sm table-hover fixed-width">
         <caption class="text-center">
@@ -68,8 +69,7 @@
         </tbody>
     </table>
 
-    <!-- <hr> -->
-    <!-- <h5>Notes</h5> -->
+    <br>
 
     <ul>
         <li>
diff --git a/src/app/views/cheat-sheets/material-processing/material-processing.component.html b/src/app/views/cheat-sheets/material-processing/material-processing.component.html
index eccbaee5..6efadadf 100644
--- a/src/app/views/cheat-sheets/material-processing/material-processing.component.html
+++ b/src/app/views/cheat-sheets/material-processing/material-processing.component.html
@@ -95,6 +95,7 @@ <h4 class="card-title" id="smelting-facts">Smelting Facts</h4>
                 </li>
                 <li>One furnace making iron can support one furnace making steel.</li>
                 <li>Stone and Steel Furnaces consume 0.0225 coal/second.</li>
+                <li>Common <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=862972621" target="_blank" rel="noopener">Smelter Arrangements</a></li>
             </ul>
         </div>
 
@@ -150,7 +151,7 @@ <h4 class="card-title" id="uranium-facts">Uranium Facts</h4>
                 <i class="fas fa-long-arrow-alt-right text-muted"></i>
                 <app-factorio-icon [icon]="dataService.getFactorioIcon('Uranium-235', 7)"></app-factorio-icon>
                 <app-factorio-icon [icon]="dataService.getFactorioIcon('Uranium-238', 993)"></app-factorio-icon>
-                <a href="#oil_ratio_note">*</a>
+                <a href="#note_uranium_processing_ratio">**</a>
             </p>
             <p class="text-center">
                 <app-factorio-icon [icon]="dataService.getFactorioIcon('Uranium-235', 40)"></app-factorio-icon>
@@ -163,9 +164,9 @@ <h4 class="card-title" id="uranium-facts">Uranium Facts</h4>
     </div>
 
     <hr>
-    <p id="uranium_processing_ratio_note">
+    <p id="note_uranium_processing_ratio">
         <small>
-            * 10000 not 1000 ore, as
+            ** 10000 not 1000 ore, as
             <a href="https://wiki.factorio.com/Uranium_processing" target="_blank" rel="noopener">Uranium processing</a>
              takes 10 ore and produces 1 product on avg.
         </small>
diff --git a/src/app/views/cheat-sheets/modules-and-beacons/modules-and-beacons.component.html b/src/app/views/cheat-sheets/modules-and-beacons/modules-and-beacons.component.html
index 6bee186f..993f2bd1 100644
--- a/src/app/views/cheat-sheets/modules-and-beacons/modules-and-beacons.component.html
+++ b/src/app/views/cheat-sheets/modules-and-beacons/modules-and-beacons.component.html
@@ -27,11 +27,11 @@
                 </li>
 
                 <li>
-                    <a href="https://wiki.factorio.com/Efficiency_module_3" target="_blank" rel="noopener">Efficiency Modules</a> make your factory green,
-                    reducing power usage.
+                    <a href="https://wiki.factorio.com/Efficiency_module_3" target="_blank" rel="noopener">Efficiency Modules</a> reduce power usage.
                     <ul>
                         <li>Best to put in energy hogs.</li>
                         <li>Reducing Energy = Reducing pollution</li>
+                        <li>Tier 1 are superb in mining drills b/c there are so many</li>
                     </ul>
                 </li>
             </ul>
diff --git a/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.html b/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.html
index 89376759..95f2925b 100644
--- a/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.html
+++ b/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.html
@@ -97,7 +97,7 @@ <h4 class="card-title" id="nuclear-sre-diagrams">SRE Diagrams</h4>
                 <div class="card-body row">
                     <div class="col-12 col-sm-6">
                     <h6 class="card-subtitle mb-2 text-muted">2xN Configuration</h6>
-                    <p class="card-text">
+                    <p>
                         16 reactors: 2x8, is<br>
                         <kbd>4*3 + 12*4 = 60 SRE</kbd>
                     <p>
@@ -114,7 +114,7 @@ <h6 class="card-subtitle mb-2 text-muted">2xN Configuration</h6>
                 <div class="card-body row">
                     <div class="col-12 col-sm-7">
                     <h6 class="card-subtitle mb-2 text-muted">NxM Configuration</h6>
-                    <p class="card-text">
+                    <p>
                         16 reactors: 4x4, is<br>
                         <kbd>4*3 + 8*4 + 4*5 = 64 SRE</kbd>
                     <p>
@@ -205,19 +205,44 @@ <h4 class="card-title" id="nuclear-formulas">Formulas</h4>
         for more details.
     </p>
 
-    <p><kbd>
-    Heat Exchangers (even config) = [Heat Exchangers Per Reactor * 4 * reactors] - [Heat Exchangers Per Reactor * 4]
-    </kbd></p>
-    <p><kbd>
-    Power (even config) = [Reactor Power * 4 * reactors] - [Reactor Power * 4]
-    </kbd></p>
-    <p><kbd>
-    Turbines = [Heat Exchangers * Heat Exchanger Power(10MW)] / [Turbine Power(5.82MW)]
-    </kbd></p>
-    <p><kbd>
-    Pumps = [Turbines] * [Water Per Turbine / Water Per Pump]
-    </kbd></p>
-    <p><strong>Steam Tanks:</strong> 1 fuel cell creates 8 GJ per reactor (eg 2 reactors puts out 4 solo reactors of energy = 32 GJ).
+    <table class="table table-sm table-hover">
+        <thead>
+            <tr>
+                <th>Unknown</th>
+                <th>Formula</th>
+                <th>Expanded Formula</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td><kbd>Heat Exchangers Per Reactor</kbd></td>
+                <td><kbd>{{nuclearData.reactorPower / nuclearData.heatExchangerPower}}</kbd></td>
+                <td><kbd>Reactor Power({{nuclearData.reactorPower}}MW) / H.E. Power({{nuclearData.heatExchangerPower}}MW)</kbd></td>
+            </tr>
+            <tr>
+                <td><kbd>Power (even config)</kbd></td>
+                <td><kbd>{{nuclearData.reactorPower*4}} * [Reactors - 1]</kbd></td>
+                <td><kbd>[Reactor Power({{nuclearData.reactorPower}}MW) * 4 * Reactors] - [Reactor Power * 4]</kbd></td>
+            </tr>
+            <tr>
+                <td><kbd>Heat Exchangers (even config)</kbd></td>
+                <td><kbd>{{nuclearData.reactorPower / nuclearData.heatExchangerPower*4}} * [Reactors - 1]</kbd></td>
+                <td><kbd>[H.E. Per Reactor * 4 * Reactors] - [H.E. Per Reactor * 4]</kbd></td>
+            </tr>
+            <tr>
+                <td><kbd>Turbines</kbd></td>
+                <td><kbd>{{nuclearData.heatExchangerPower/nuclearData.turbinePower | number}} * Heat Exchangers</kbd></td>
+                <td><kbd>Heat Exchangers * H.E. Power({{nuclearData.heatExchangerPower}}MW) / Turbine Power({{nuclearData.turbinePower}}MW)</kbd></td>
+            </tr>
+            <tr>
+                <td><kbd>Pumps</kbd></td>
+                <td><kbd>{{nuclearData.waterPerTurbine/nuclearData.waterPerPump | number}} * Turbines</kbd></td>
+                <td><kbd>Turbines * Water Per Turbine({{nuclearData.waterPerTurbine}}) / Water Per Pump({{nuclearData.waterPerPump}})</kbd></td>
+            </tr>
+        </tbody>
+    </table>
+
+    <p><strong>Steam Tanks:</strong> 1 fuel cell creates 8 GJ per reactor (eg. 2 reactors put out 4 solo reactors worth of energy = 32 GJ).
         <br>Each tank can hold 2.425 GJ worth of steam, or 3.29 tanks per reactor.
     </p>
 
diff --git a/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.ts b/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.ts
index cf739cc7..60fc0b82 100644
--- a/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.ts
+++ b/src/app/views/cheat-sheets/nuclear-power/nuclear-power.component.ts
@@ -48,6 +48,7 @@ export class NuclearPowerComponent implements OnInit {
                 this.cheatSheet = result.cheatSheet;
                 this.sheetData = result.data;
 
+                this.nuclearData.waterPerPump = 1200;
                 this.nuclearData.reactorPower = this.sheetData.reactorPowerMW;
                 this.nuclearData.heatExchangerPower = this.sheetData.heatExchangerPowerMW;
                 this.nuclearData.turbinePower = this.sheetData.turbinePowerMW;
@@ -107,7 +108,7 @@ export class NuclearPowerComponent implements OnInit {
         const heatExchangersPerReactor = reactorPower / heatExchangerPower;
         const waterPerTurbine = this.nuclearData.waterPerTurbine;
         const storageTanksPerReactor = this.nuclearData.storageTanksPerReactor;
-        const waterPerPump = 1200;
+        const waterPerPump = this.nuclearData.waterPerPump;
 
         // Set inital data that will be calculated
         let reactorConfig = '1';
@@ -174,6 +175,7 @@ interface NukeRatioData {
 }
 
 interface NuclearData {
+    waterPerPump: number;
     reactorPower: number;
     heatExchangerPower: number;
     turbinePower: number;
diff --git a/src/app/views/cheat-sheets/oil-refining/oil-refining.component.html b/src/app/views/cheat-sheets/oil-refining/oil-refining.component.html
index f95f82a4..2bf45d78 100644
--- a/src/app/views/cheat-sheets/oil-refining/oil-refining.component.html
+++ b/src/app/views/cheat-sheets/oil-refining/oil-refining.component.html
@@ -26,8 +26,8 @@ <h4 id="basic-oil">Basic Oil</h4>
     <br>
 
     <p>
-        When starting oil, it is most efficient to rush <a href="https://wiki.factorio.com/Advanced_oil_processing_(research)" target="_blank" rel="noopener">Advanced Oil Processing</a> research.
-        <br>This allows to obtain more efficient oil ratios and be able to convert Heavy and Light Oil into Petroleum Gas.
+        When starting oil, it is beneficial to rush <a href="https://wiki.factorio.com/Advanced_oil_processing_(research)" target="_blank" rel="noopener">Advanced Oil Processing</a> research.
+        <br>This unlocks Light/Heavy Oil, and allows to obtain more efficient oil ratios by converting the Light and Heavy Oil into Petroleum Gas.
     </p>
 
     <hr>
diff --git a/src/app/views/cheat-sheets/productivity-module-payoffs/productivity-module-payoffs.component.html b/src/app/views/cheat-sheets/productivity-module-payoffs/productivity-module-payoffs.component.html
index 7d365071..0839de58 100644
--- a/src/app/views/cheat-sheets/productivity-module-payoffs/productivity-module-payoffs.component.html
+++ b/src/app/views/cheat-sheets/productivity-module-payoffs/productivity-module-payoffs.component.html
@@ -1,5 +1,5 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
-    <p class="card-text">
+    <p>
         What are the best things to invest productivity modules into?
         <br> Based on
         <a href="https://docs.google.com/spreadsheets/d/1M3bbVKSs3IWzLtBHEbe0iJcbnh7raERDcL6dOh1y3oY/" target="_blank"
diff --git a/src/app/views/cheat-sheets/science/science.component.html b/src/app/views/cheat-sheets/science/science.component.html
index b891df5c..cd0e4fb4 100644
--- a/src/app/views/cheat-sheets/science/science.component.html
+++ b/src/app/views/cheat-sheets/science/science.component.html
@@ -1,11 +1,14 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
-
-    <p class="card-text">
-        <span>The Vanilla game has all research balanced in the number of different science packs required,
-            so optimally all science should be produced at the same rate.</span><br>
-        <span>However the different science pack themselves have various crafting times and outputs,
-            thus you'll need a different number of assemblers making each science to prevent bottlenecks.</span><br>
-    </p>
+    <ul>
+        <li>
+            Research is balanced in the number of different science packs required,
+            so optimally all science should be produced at the same rate.
+        </li>
+        <li>
+            Science Packs have various crafting times and outputs;
+            you'll need different number of assemblers making each type to prevent bottlenecks.
+        </li>
+    </ul>
 
     <div class="text-center">
         <span class="text-muted">Number of assemblers needed to produce science equally</span>
@@ -24,25 +27,29 @@
         </div>
     </div>
 
-    <br>
-
-    <p class="card-text">
-        Check the <a href="#common-ratios">ratios for each science pack</a>.
-        <br>
-        Check your
-        <a href="{{ scienceRequirementsLink }}" target="_blank" rel="noopener">
-            Resource requirements
-        </a> to keep production steady.
-    </p>
+    <ul>
+        <li>
+            Check the <a href="#common-ratios">ratios for each science pack</a>.
+        </li>
+        <li>
+            Check your
+            <a href="{{ scienceRequirementsLink }}" target="_blank" rel="noopener">
+                Resource requirements
+            </a> to keep production steady.
+        </li>
+        <li>
+            You can move science packs between labs with inserters.
+        </li>
+    </ul>
 
     <hr>
     <div class="row align-items-center">
         <div class="col-12 col-lg-6">
-            <p class="card-text text-center">
+            <p class="text-center">
                 <strong>Space Science</strong>
             </p>
-            <p class="card-text">
-                For 1 space science pack per second you need to launch a rocket with satellite every 16.67 minutes.<br>
+            <p>
+                For 1 space science pack per second you need to launch a rocket with a satellite every 16.67 minutes.<br>
             </p>
             <p class="text-center"><kbd>Rockets launch interval (in minutes) = (1000 science / (assembler speed * ratio multiplier)) * (1min/60sec)</kbd></p>
         </div>
@@ -71,7 +78,7 @@
     <hr>
     <div class="row align-items-center">
         <div class="col-12 col-lg-12">
-            <p class="card-text text-center">
+            <p class="text-center">
                 <strong>Number of Labs required</strong>
             </p>
         </div>
diff --git a/src/app/views/cheat-sheets/tips/tips.component.html b/src/app/views/cheat-sheets/tips/tips.component.html
index d19fabd6..16aad4a7 100644
--- a/src/app/views/cheat-sheets/tips/tips.component.html
+++ b/src/app/views/cheat-sheets/tips/tips.component.html
@@ -1,29 +1,30 @@
 <app-cheat-sheet [cheatSheet]="cheatSheet">
 
-    <p>
-        See more
-        <a href="https://wiki.factorio.com/Tutorial:Keyboard_shortcuts" target="_blank" rel="noopener">keyboard shortcuts</a>
-        on the wiki.
-    </p>
-
+    <h4 id="tips-shortcuts">
+        <a href="https://wiki.factorio.com/Tutorial:Keyboard_shortcuts" target="_blank" rel="noopener">
+            Shortcuts
+        </a> <small class="text-muted">(Most Used)</small>
+    </h4>
     <ul>
         <li>
-            The <kbd>Alt</kbd> key will reveal detailed information on entities,
+            <kbd>Alt</kbd> - reveal detailed information on entities,
             you can also use the
             <a href="https://wiki.factorio.com/Shortcut_bar" target="_blank" rel="noopener">shortcut bar (click on the ALT button)</a>
         </li>
         <li>
-            The <kbd>MMB</kbd> will clear an item in the
+            <kbd>MMB</kbd> - clear an item in the
             <a href="https://wiki.factorio.com/Quickbar" target="_blank" rel="noopener">quick bar</a>,
             and can set filters in cargo wagons and your inventory. <small>(<kbd>CMD+RMB</kbd> on macOS.)</small>
         </li>
         <li>
-            You can rotate entities with <kbd>R</kbd>,
+            <kbd>R</kbd> - rotate entities,
             even when already placed, <kbd>Shift+R</kbd> for the opposite.
         </li>
         <li>
-            Inserters will always place items on the furthest side of the belt,
-            and prioritize taking items from the closest.
+            <kbd>CTRL-LMB</kbd> - Put/Take All Items, <kbd>CTRL-RMB</kbd> - Put/Take Half Items
+        </li>
+        <li>
+            <kbd>Z</kbd> Drop 1 Item
         </li>
         <li>
             Hold <kbd>Shift</kbd> while building
@@ -42,79 +43,104 @@
                 <li>You can copy individual slots (inventory, cargo wagon)</li>
             </ul>
         </li>
-        <li>Placing over ghosts will preserve the recipes</li>
         <li>
-            Hover over an entity and press <kbd>Q</kbd> to quick-select it from your inventory.
+            <kbd>Q</kbd> while hovering over anything to quick-select it from your inventory.
             <ul>
                 <li>Press <kbd>Q</kbd> on ores to select miners.</li>
             </ul>
         </li>
         <li>
-            You can use standard <kbd>CTRL+C</kbd>, <kbd>CTRL+V</kbd>,
-            <kbd>CTRL+X</kbd>, <kbd>CTRL+Z</kbd> commands to copy, paste, cut and undo your builds.
+            <kbd>CTRL+C</kbd>, <kbd>CTRL+V</kbd>,
+            <kbd>CTRL+X</kbd>, <kbd>CTRL+Z</kbd> - copy, paste, cut and undo your builds.
             <small>(<kbd>CMD</kbd> vs <kbd>CTRL</kbd> on macOS.)</small>
         </li>
-        <li>You can move science packs between labs with inserters.</li>
         <li>
-            Fluids can move through boilers, tanks,
-            and electric mining drills (only when mining uranium).
+            <kbd>Numpad-</kbd> / <kbd>Numpad+</kbd> - increase / decrease
+            the size of any placed tile (such as landfill or concrete).
         </li>
         <li>
-            Using underground pipes counts as less entities then
-            if straight pipe for same distance, increasing game performance.
+            <kbd>Shift+RMB</kbd> - clear Blueprint or Deconstruction Planner Filters
         </li>
-        <li>Blueprints can be used from map view when
-            zoomed in on a revealed area of the map (near the player or by radar).
+        <li>
+            <kbd>Shift+LMB</kbd> - ping the ground/map.
         </li>
         <li>
-            <kbd>Numpad+</kbd> / <kbd>Numpad-</kbd> can be used to
-            increase / decrease the size of any placed tile
-            (such as landfill or concrete).
+            <kbd>`</kbd> (tilde key) - Open chat/command line
         </li>
-        <li>Trains snap into position when placed at train stations.</li>
-        <li>Clear Blueprint or Deconstruction Planner Filters by <kbd>Shift+RMB</kbd></li>
+    </ul>
+
+    <h4 id="tips-cmd">
+        <a href="https://wiki.factorio.com/Console#Normal_commands">Commands</a>
+         <small class="text-muted"> (These do <strong>not</strong> disable achievements)</small>
+    </h4>
+    <ul>
         <li>
-            For <strong>Lazy Bastard Achievement</strong> Open Console,
-            type <kbd>/permissions</kbd>, Disable <i>Craft</i>.
+            <kbd>/permissions</kbd>, disable <i>Craft</i> - Useful for
+            <a href="https://wiki.factorio.com/Achievements" target="_blank" rel="noopener">
+                Lazy Bastard Achievement
+            </a>
         </li>
         <li>
-            Map ping tags can be created by <kbd>Shift+LMB</kbd> the ground/map.
+            <kbd>/screenshot [x resolution] [y resolution] [zoom]</kbd> - Useful for large/HD screenshots.
+            <br> (Resolution is optional and defaults to the current window size and zoom is optional and defaults to 1).
         </li>
         <li>
-            <a href="https://wiki.factorio.com/Rich_text" target="_blank" rel="noopener noreferrer">Rich text</a>
-            "<i>[item=iron-plate]</i>" is displayed as the iron plate icon.
-            <br> To quickly get a rich text tag for an item: open the console, then shift-click on the item (eg in your inventory, a chest, etc.)
+            <kbd>[item=iron-plate]</kbd> / <kbd>[fluid=crude-oil]</kbd> - part of
+            <a href="https://wiki.factorio.com/Rich_text" target="_blank" rel="noopener">Rich text</a>,
+            will display as an icon! Useful for blueprints/station names.
+            <br> To quickly get a rich text tag for an item: open the console, then <kbd>Shift+LMB</kbd> on the item (eg. in your inventory, a chest, etc.)
             <br> A rich text tag for that item appears in the console and can be copied.
         </li>
+    </ul>
+
+    <h4 id="tips-debug">
+        <a href="https://wiki.factorio.com/Debug_mode" target="_blank" rel="noopener">
+            Debug Menu
+        </a>
+        <small class="text-muted">(<kbd>F4</kbd> also <kbd>F5</kbd> )</small>
+    </h4>
+    <p>Some useful options to enable</p>
+    <ul>
+        <li><kbd>show-fps</kbd> - FPS/UPS</li>
+        <li><kbd>show-multiplayer-statistics</kbd> - Latency</li>
+        <li><kbd>show-tile-grid</kbd>, <kbd>show-raw-tile-transitions</kbd> - Precision construction</li>
+        <li><kbd>show-rail-paths</kbd> - Less likely to get run over</li>
         <li>
+            <kbd>show-rail-signal-states</kbd> -
             <a href="https://www.reddit.com/r/factorio/comments/8zvbfn/til_you_can_display_signal_states_on_the_map/" target="_blank" rel="noopener">
-                Display signal states
+                Rail signal states
             </a>
-            on the map by enabling <strong>"show-rail-signal-states"</strong>
-            in the <kbd>F4</kbd> debug menu.
+            on the map.
         </li>
+        <li><kbd>show-transport-line-gaps</kbd> - Identify unsaturated belts</li>
+        <li><kbd>show-logistic-robots-on-map</kbd></li>
+        <li><kbd>show-recipe-icons-on-map</kbd></li>
+        <li><kbd>show-player-robots</kbd> - Makes it clear if there are stragglers</li>
+        <li><kbd>allow-increased-zoom</kbd></li>
+    </ul>
+
+    <h4 id="tips-misc">Misc</h4>
+    <ul>
         <li>
-            To take a large screenshot use the <a href="https://wiki.factorio.com/Console#Normal_commands">command </a> <kbd>/screenshot [x resolution] [y resolution] [zoom]</kbd>.
-            <br> (Resolution is optional and defaults to the current window size and zoom is optional and defaults to 1).
-            <br> This command does <strong>not</strong> disable achievements.
+            <a href="https://www.reddit.com/r/factorio/comments/bjbcsi/ranges_of_all_turrets_worms_vehicles_weapons_and/" target="_blank" rel="noopener">
+                Combat
+            </a>: Weapon
+            <a href="https://i.imgur.com/6EenAcn.png" target="_blank" rel="noopener">
+                Range Comparison
+            </a> Diagram
+        </li>
+        <li>
+            Inserters will always place items on the furthest side of the belt,
+            and prioritize taking items from the closest.
+        </li>
+        <li>Placing over ghosts will preserve the recipes</li>
+        <li>
+            Fluids can move through boilers, tanks,
+            and electric mining drills (only when mining uranium).
+        </li>
+        <li>Blueprints can be used from map view when
+            zoomed in on a revealed area of the map (near the player or by radar).
         </li>
     </ul>
 
-    <hr>
-
-    <div class="row align-items-center justify-content-around">
-        <div class="col-6 col-lg-4 col-print-4 text-center">
-            <strong>Underground belts can be side loaded</strong><br>
-            <img src="{{APP_SETTINGS.links.getLocalImagePath('belt-tip-side-load.webp')}}" class="img-fluid rounded limit-img-height" alt="Side Load Underground" title="Side Load Underground">
-        </div>
-        <div class="col-6 col-lg-4 col-print-4 text-center">
-            <strong>Splitters can filter items</strong><br>
-            <img src="{{APP_SETTINGS.links.getLocalImagePath('belt-tip-filter.webp')}}" class="img-fluid rounded limit-img-height" alt="Splitter Filter" title="Splitter Filter">
-        </div>
-        <div class="col-6 col-lg-4 col-print-4 text-center">
-            <strong>Belts can be woven</strong><br>
-            <img src="{{APP_SETTINGS.links.getLocalImagePath('belt-weaving.webp')}}" class="img-fluid rounded limit-img-height" alt="Splitter Filter" title="Splitter Filter">
-        </div>
-    </div>
-
 </app-cheat-sheet>
diff --git a/src/app/views/main/main.component.html b/src/app/views/main/main.component.html
index 8ee114d7..abfbbbff 100644
--- a/src/app/views/main/main.component.html
+++ b/src/app/views/main/main.component.html
@@ -2,6 +2,7 @@
     <h2>Cheat Sheets</h2>
     <hr>
     <div class="cheat-sheet-pages">
+        <app-common-ratios></app-common-ratios>
         <app-belt-throughput></app-belt-throughput>
         <app-balancers></app-balancers>
         <app-material-processing></app-material-processing>
@@ -14,8 +15,7 @@ <h2>Cheat Sheets</h2>
         <app-cargo-wagon-transfer></app-cargo-wagon-transfer>
         <app-inserter-throughput></app-inserter-throughput>
         <app-inserter-capacity-bonus></app-inserter-capacity-bonus>
-        <app-common-ratios></app-common-ratios>
-        <app-combat></app-combat>
+        <!-- <app-combat></app-combat> -->
         <app-modules-and-beacons></app-modules-and-beacons>
         <app-productivity-module-payoffs></app-productivity-module-payoffs>
         <app-vehicle-fuel-bonus></app-vehicle-fuel-bonus>
diff --git a/src/app/views/overview/overview.component.html b/src/app/views/overview/overview.component.html
index 4a3b6f7e..7d24dafa 100644
--- a/src/app/views/overview/overview.component.html
+++ b/src/app/views/overview/overview.component.html
@@ -29,7 +29,7 @@ <h2>Overview</h2>
 
     <div class="row">
         <div class="col-12">
-            Some notes:
+            <h5>Notes</h5>
             <ul>
                 <li>
                     The <a href="https://wiki.factorio.com/" target="_blank" rel="noopener">Wiki</a>
@@ -55,7 +55,7 @@ <h2>Overview</h2>
                         Github
                     </a>,
                     <a href="https://discord.gg/PkyzXzz" target="_blank" rel="noopener">Discord</a>, or
-                    <a href="https://www.reddit.com/r/factorio/comments/avp7c8/factorio_cheat_sheet_updated_to_v017/"
+                    <a href="https://www.reddit.com/r/factorio/comments/i5lylg/factorio_cheat_sheet_update_for_v10/"
                         target="_blank" rel="noopener">
                         Reddit
                     </a>.
@@ -65,6 +65,12 @@ <h2>Overview</h2>
                         Known Issues
                     </a>
                 </li>
+                <li>
+                    Also check out the
+                    <a href="https://deniszholob.github.io/satisfactory-cheat-sheet/" target="_blank" rel="noopener">
+                        Satisfactory Cheat Sheet
+                    </a>
+                </li>
             </ul>
 
             <hr>
diff --git a/src/assets/data/belt-throughput.json b/src/assets/data/belt-throughput.json
index 8c6fdfb6..f144fe22 100644
--- a/src/assets/data/belt-throughput.json
+++ b/src/assets/data/belt-throughput.json
@@ -1,6 +1,6 @@
 {
     "cheatSheet": {
-        "title": "Belt Throughput",
+        "title": "Belts",
         "icon": "Transport_belt"
     },
     "data": {
diff --git a/src/assets/data/links.json b/src/assets/data/links.json
index c425ae9a..27775c30 100644
--- a/src/assets/data/links.json
+++ b/src/assets/data/links.json
@@ -89,6 +89,10 @@
                     {
                         "url": "https://calculatorio.com/",
                         "text": "Calculatorio Production Calcs"
+                    },
+                    {
+                        "url": "https://factoriolab.github.io/",
+                        "text": "Factorio Lab"
                     }
                 ]
             },
@@ -122,11 +126,15 @@
                 "links": [
                     {
                         "url": "https://www.youtube.com/playlist?list=PLnIE0W-m629dSJPPEETVY71CQhOfZ6r7W",
-                        "text": "Start Here: Factorio Fundamentals"
+                        "text": "Factorio Fundamentals (JDPlays)"
                     },
                     {
                         "url": "https://www.youtube.com/playlist?list=PLV3rF--heRVu2xlDGZiRbdb7nbwzM9Vyz",
-                        "text": "Factorio Master Class"
+                        "text": "Factorio Master Class (Nilaus)"
+                    },
+                    {
+                        "url": "https://www.youtube.com/playlist?list=PLwehwVVQirAep2XwjX1IoJR4XIqU4eUCH",
+                        "text": "Factorio Fundamentals (Xterminator)"
                     },
                     {
                         "url": "https://www.reddit.com/r/factorio/comments/arpn41/first_2030_minutes_guide_in_vanilla/",
diff --git a/src/assets/data/nav.json b/src/assets/data/nav.json
index 40e7bc84..9e3a64f0 100644
--- a/src/assets/data/nav.json
+++ b/src/assets/data/nav.json
@@ -1,6 +1,7 @@
 {
     "nav": [
-        "belt-throughput",
+        "common-ratios",
+        "belts",
         "balancers",
         "material-processing",
         "mining",
@@ -12,8 +13,6 @@
         "cargo-wagon-transfer",
         "inserter-throughput",
         "inserter-capacity-bonus",
-        "common-ratios",
-        "combat",
         "modules-and-beacons",
         "productivity-module-payoffs",
         "vehicle-fuel-bonus",
diff --git a/src/assets/icons/cheat-sheet-banner.webp b/src/assets/icons/cheat-sheet-banner.webp
deleted file mode 100644
index af2c5234..00000000
Binary files a/src/assets/icons/cheat-sheet-banner.webp and /dev/null differ
diff --git a/src/assets/icons/factorio-cheat-sheet-rocket-launch.webp b/src/assets/icons/factorio-cheat-sheet-rocket-launch.webp
new file mode 100644
index 00000000..110a8e39
Binary files /dev/null and b/src/assets/icons/factorio-cheat-sheet-rocket-launch.webp differ
diff --git a/src/assets/icons/factorio-cheat-sheet-splash.png b/src/assets/icons/factorio-cheat-sheet-splash.png
deleted file mode 100644
index 59a15715..00000000
Binary files a/src/assets/icons/factorio-cheat-sheet-splash.png and /dev/null differ
diff --git a/src/assets/icons/factorio-cheat-sheet-splash.webp b/src/assets/icons/factorio-cheat-sheet-splash.webp
new file mode 100644
index 00000000..7918c277
Binary files /dev/null and b/src/assets/icons/factorio-cheat-sheet-splash.webp differ
diff --git a/src/assets/images/balancer-4x4.webp b/src/assets/images/balancer-4x4.webp
index a9544dd5..cc9d8721 100644
Binary files a/src/assets/images/balancer-4x4.webp and b/src/assets/images/balancer-4x4.webp differ
diff --git a/src/assets/images/belt-signal-circuit.webp b/src/assets/images/belt-signal-circuit.webp
index ad2c7284..404140ec 100644
Binary files a/src/assets/images/belt-signal-circuit.webp and b/src/assets/images/belt-signal-circuit.webp differ
diff --git a/src/assets/images/bus.webp b/src/assets/images/bus.webp
new file mode 100644
index 00000000..7bf1a519
Binary files /dev/null and b/src/assets/images/bus.webp differ
diff --git a/src/assets/images/fluid-io-chemical-plant.webm b/src/assets/images/fluid-io-chemical-plant.webm
index acbe771d..84426a4e 100644
Binary files a/src/assets/images/fluid-io-chemical-plant.webm and b/src/assets/images/fluid-io-chemical-plant.webm differ
diff --git a/src/assets/images/fluid-io-refinery.webm b/src/assets/images/fluid-io-refinery.webm
index 7aa2e196..c8cea273 100644
Binary files a/src/assets/images/fluid-io-refinery.webm and b/src/assets/images/fluid-io-refinery.webm differ
diff --git a/src/assets/images/mining-direct-feed.webp b/src/assets/images/mining-direct-feed.webp
index dff2c601..aae64286 100644
Binary files a/src/assets/images/mining-direct-feed.webp and b/src/assets/images/mining-direct-feed.webp differ
diff --git a/src/global-styles/_card.scss b/src/global-styles/_card.scss
index 37c4ab41..582d98d6 100644
--- a/src/global-styles/_card.scss
+++ b/src/global-styles/_card.scss
@@ -14,6 +14,9 @@
     .card-title {
         display: inline-block;
         margin: 0;
+        vertical-align: middle;
+        font-size: 1.4rem;
+        line-height: 1.4em;
     }
 
     .card-collapse {
diff --git a/src/global-styles/_intro.scss b/src/global-styles/_intro.scss
index c50d2f16..64c67d3c 100644
--- a/src/global-styles/_intro.scss
+++ b/src/global-styles/_intro.scss
@@ -4,10 +4,11 @@
     border-bottom: 1px solid $c-pallette-accent;
 
     .banner {
-        background-color: $c-pallette-transp-light;
+        background-color: $c-pallette-transp-medium;
         display: flex;
         text-align: center;
         height: 90px;
+        box-shadow: inset 0 -25px 25px -25px $c-pallette-transp-heavy;
 
         a {
             display: flex;
@@ -20,6 +21,7 @@
         h1 {
             text-transform: uppercase;
             text-shadow: 0px 0px 8px $c-pallette-transp-heavy;
+            letter-spacing: 3px;
 
             small {
                 text-transform: none;
@@ -30,10 +32,11 @@
     .greeter-img {
         display: flex;
 
-        box-shadow: inset 0 25px 25px -20px $c-pallette-transp-heavy;
+        box-shadow: inset 0 25px 25px -15px $c-pallette-transp-heavy;
 
         background-color: $c-pallette-transp-light;
-        background-image: url("/assets/icons/cheat-sheet-banner.webp");
+        background-image: url("/assets/icons/factorio-cheat-sheet-rocket-launch.webp");
+        // background-image: url("https://cdn.factorio.com/assets/img/artwork/nuclear-cheers.png");
         background-position: center center;
         background-repeat: no-repeat;
         background-size: cover;
diff --git a/src/global-styles/styles.scss b/src/global-styles/styles.scss
index e36147fb..748e855e 100644
--- a/src/global-styles/styles.scss
+++ b/src/global-styles/styles.scss
@@ -58,9 +58,11 @@ hr {
     border-color: $c-pallette-accent;
 }
 
+// Site Title
 h1 {
     color: $c-pallette-accent;
     font-family: "Play", Verdana, sans-serif;
+    font-size: 2.5rem;
 
     small {
         color: $c-pallette-text-muted;
@@ -68,9 +70,26 @@ h1 {
     }
 }
 
-h5 {
+// Section Title
+h2 {
+    font-size: 2rem;
+}
+
+// Sheet Title (controlled by _card)
+h3 {
     font-family: "Jura", sans-serif;
     font-weight: bold;
+    font-size: 1.4rem;
+}
+
+// Sheet subsection
+h4 {
+    font-size: 1.4rem;
+}
+
+// Small Title
+h5 {
+    font-size: 1.25rem;
 }
 
 li.col {
@@ -138,6 +157,10 @@ img {
     width: 100%;
 }
 
+.hide {
+    display: none;
+}
+
 
 /* On smaller screens, where height is less than 450px, change the style of the side-nav (less padding and a smaller font size) */
 @media screen and (min-width: 1366px) {
diff --git a/src/index.html b/src/index.html
index 2cceb91b..bdb52981 100644
--- a/src/index.html
+++ b/src/index.html
@@ -15,7 +15,7 @@
     <meta itemprop="name" content="Factorio Cheat Sheet">
     <meta itemprop="description"
         content="A compendium of the most common Factorio game facts, such as build ratios, tips/tricks, and links to further information.">
-    <meta itemprop="image" content="assets/icons/factorio-cheat-sheet-splash.png">
+    <meta itemprop="image" content="assets/icons/factorio-cheat-sheet-splash.webp">
 
     <!-- Facebook Meta Tags -->
     <meta property="og:url" content="https://factoriocheatsheet.com">
@@ -23,14 +23,14 @@
     <meta property="og:title" content="Factorio Cheat Sheet">
     <meta property="og:description"
         content="A compendium of the most common Factorio game facts, such as build ratios, tips/tricks, and links to further information.">
-    <meta property="og:image" content="assets/icons/factorio-cheat-sheet-splash.png">
+    <meta property="og:image" content="assets/icons/factorio-cheat-sheet-splash.webp">
 
     <!-- Twitter Meta Tags -->
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:title" content="Factorio Cheat Sheet">
     <meta name="twitter:description"
         content="A compendium of the most common Factorio game facts, such as build ratios, tips/tricks, and links to further information.">
-    <meta name="twitter:image" content="assets/icons/factorio-cheat-sheet-splash.png">
+    <meta name="twitter:image" content="assets/icons/factorio-cheat-sheet-splash.webp">
 
     <!-- Title/Icons -->
     <title>Factorio Cheat Sheet</title>
@@ -75,6 +75,15 @@
         gtag('js', new Date());
         gtag('config', 'UA-28080172-9');
     </script>
+
+    <!-- Basic colors to prevent default blinding white to flash right b4 css loads... -->
+    <style>
+        html, body {
+            background-color: #141516;
+            color: #eee;
+            font-family: 'Play', sans-serif;
+        }
+    </style>
 </head>
 
 <body>