diff --git a/index.html b/index.html
index d837c39..00b2c40 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
 	<link rel="apple-touch-icon" sizes="144x144" href="/images/touch/icons-144.png"/>
 	<link rel="apple-touch-icon" sizes="152x152" href="/images/touch/icons-152.png"/>
 	<link rel="apple-touch-icon" sizes="180x180" href="/images/touch/icons-180.png"/>
-	<link rel="icon" type="image/svg+xml" href="images/moonlight.svg"/>
+	<link rel="icon" type="image/svg+xml" href="/images/moonlight.svg"/>
 	<link rel="icon" type="image/png" href="/images/manifest/icons-16.png" sizes="16x16"/>
 	<link rel="icon" type="image/png" href="/images/manifest/icons-32.png" sizes="32x32"/>
 	<link rel="icon" type="image/png" href="/images/manifest/icons-96.png" sizes="96x96"/>
@@ -148,7 +148,7 @@
 								</a>
 							</li>
 							<li>
-								<a href="https://github.com/irtimmer/moonlight-embedded/wiki/Packages">
+								<a href="https://github.com/moonlight-stream/moonlight-embedded/wiki/Packages">
 									<div>Single-board computers</div>
 								</a>
 							</li>
@@ -238,14 +238,15 @@
 		<div class="title">Download Moonlight</div>
 		<!-- Row 1 -->
 		<div id="highlights" class="container">
+			<!-- First row -->
 			<div class="row oneandhalf">
 				<div class="3u">
 					<section class="highlight">
 						<h3><a href="https://github.com/moonlight-stream/moonlight-qt">Moonlight for PC, Mac, and more</a></h3>
 						<p>Stream to Windows, MacOS, Linux, Steam Link devices, and Raspberry Pi 4</p>
-					<ul class="actions">
+						<ul class="actions">
 							<li><a href="https://github.com/moonlight-stream/moonlight-qt/releases" class="button style1">Download</a></li>
-					</ul>
+						</ul>
 					</section>
 				</div>
 				<div class="3u">
@@ -253,7 +254,7 @@
 						<h3><a href="https://github.com/moonlight-stream/moonlight-chrome">Moonlight for ChromeOS</a></h3>
 						<p>Stream to ChromeOS laptops and tablets</p>
 					<ul class="actions">
-							<li><a href="https://chrome.google.com/webstore/detail/moonlight-game-streaming/gemamigbbenahjlfnmlfdjhdnkpbkfjj"><img src="images/chrome_webstore.png" alt="Chrome Webstore Badge"></a></li>
+							<li><a href="https://chrome.google.com/webstore/detail/moonlight-game-streaming/gemamigbbenahjlfnmlfdjhdnkpbkfjj"><img src="images/chrome_webstore.png" alt="Chrome Webstore Badge" width="206" height="58"></a></li>
 					</ul>
 					</section>
 				</div>
@@ -261,39 +262,39 @@
 					<section class="highlight">
 						<h3><a href="https://github.com/moonlight-stream/moonlight-android">Moonlight for Android</a></h3>
 						<p>Stream to Android devices</p>
-					<ul class="actions">
-							<a href="https://play.google.com/store/apps/details?id=com.limelight"><img src="images/google-play-badge.png" width="203" height="60" alt="Download" /></a>
-							<a href="https://www.amazon.com/gp/product/B00JK4MFN2"><img src="images/amazon-appstore-badge-english-black.png" alt="Download" width="203" height="60" /></a>
-							<a href="https://f-droid.org/packages/com.limelight"><img src="images/fdroid-badge.png" alt="Download" width="203" height="60" /></a>
-					</ul>
+						<ul class="actions">
+							<li><a href="https://play.google.com/store/apps/details?id=com.limelight"><img src="images/google-play-badge.png" alt="Download from Google Play" width="203" height="60" /></a></li>
+							<li><a href="https://www.amazon.com/gp/product/B00JK4MFN2"><img src="images/amazon-appstore-badge-english-black.png" alt="Download from the Amazon Appstore" width="203" height="60" /></a></li>
+							<li><a href="https://f-droid.org/packages/com.limelight"><img src="images/fdroid-badge.png" alt="Download from F-Droid" width="203" height="60" /></a></li>
+						</ul>
 					</section>
 				</div>
 				<div class="3u">
 					<section class="highlight">
 						<h3><a href="https://github.com/moonlight-stream/moonlight-ios">Moonlight for iOS &amp; Apple TV</a></h3>
 						<p>Stream to iPhone, iPad, iPod touch, and Apple TV</p>
-					<ul class="actions">
-							<a href="https://apps.apple.com/us/app/moonlight-game-streaming/id1000551566"><img src="images/App_Store_Badge_135x40.svg" alt="Download" width="203" height="60" /></a>
-					</ul>
+						<ul class="actions">
+							<li><a href="https://apps.apple.com/us/app/moonlight-game-streaming/id1000551566"><img src="images/App_Store_Badge_135x40.svg" alt="Download from the App Store" width="203" height="60" /></a></li>
+						</ul>
 					</section>
 				</div>
 			</div>
-			<!---Second Row -->
+			<!-- Second Row -->
 			<div class="row oneandhalf">
 				<div class="4u">
 					<section class="highlight">
-						<h3><a href="https://github.com/irtimmer/moonlight-embedded">Moonlight Embedded</a></h3>
-						<p>Stream to single-board computers (Community port)</p>
-					<ul class="actions">
-							<li><a href="https://github.com/irtimmer/moonlight-embedded/wiki/Packages" class="button style1">Download</a></li>
-					</ul>
+						<h3><a href="https://github.com/moonlight-stream/moonlight-embedded">Moonlight Embedded</a></h3>
+						<p>Stream to single-board computers</p>
+						<ul class="actions">
+							<li><a href="https://github.com/moonlight-stream/moonlight-embedded/wiki/Packages" class="button style1">Download</a></li>
+						</ul>
 					</section>
 				</div>
 				<div class="4u">
 					<section class="highlight">
 						<h3><a href="https://github.com/TheElixZammuto/moonlight-xbox">Moonlight for Xbox</a></h3>
 						<p>Stream to Xbox One and Xbox Series S|X Consoles (Community Port)</p>
-					<ul class="actions">
+						<ul class="actions">
 							<li><a href="https://apps.microsoft.com/store/detail/moonlight-uwp/9MW1BS08ZBTH"><img src="images/en-us%20dark.svg" alt="Download from the Microsoft Store" width="200" height="59" /></a></li>
 						</ul>
 					</section>
@@ -302,12 +303,11 @@
 					<section class="highlight">
 						<h3><a href="https://github.com/xyzz/vita-moonlight">Moonlight for PS Vita (Homebrew)</a></h3>
 						<p>Stream to a Homebrew-enabled PlayStation Vita (Community port)</p>
-					<ul class="actions">
+						<ul class="actions">
 							<li><a href="https://github.com/xyzz/vita-moonlight/releases" class="button style1">Download</a></li>
-					</ul>
+						</ul>
 					</section>
 				</div>
-				
 			</div>
 			<!-- Third row -->
 			<div class="row oneandhalf">
@@ -315,33 +315,32 @@
 					<section class="highlight">
 						<h3><a href="https://github.com/XITRIX/Moonlight-Switch">Moonlight for Nintendo Switch (Homebrew)</a></h3>
 						<p>Stream to a Homebrew-enabled Nintendo Switch (Community port)</p>
-					<ul class="actions">
+						<ul class="actions">
 							<li><a href="https://github.com/XITRIX/Moonlight-Switch/releases" class="button style1">Download</a></li>
-					</ul>
+						</ul>
 					</section>
 				</div>
 				<div class="4u">
 					<section class="highlight">
 						<h3><a href="https://github.com/GaryOderNichts/moonlight-wiiu">Moonlight for Wii U (Homebrew)</a></h3>
 						<p>Stream to a Homebrew-enabled Wii U (Community port)</p>
-					<ul class="actions">
+						<ul class="actions">
 							<li><a href="https://github.com/GaryOderNichts/moonlight-wiiu#quick-start" class="button style1">Download</a></li>
-					</ul>
+						</ul>
 					</section>
 				</div>
 				<div class="4u">
 					<section class="highlight">
 						<h3><a href="https://github.com/mariotaku/moonlight-tv">Moonlight for LG webOS TVs (Homebrew)</a></h3>
 						<p>Stream to a LG webOS TV in Developer Mode (Community port)</p>
-					<ul class="actions">
+						<ul class="actions">
 							<li><a href="https://github.com/mariotaku/moonlight-tv#download" class="button style1">Download</a></li>
-					</ul>
+						</ul>
 					</section>
 				</div>
 			</div>
 		</div>
 	</div>
-	</div>
 
 	<!-- Moonlight getting started tab -->
 	<div class="wrapper style2">
@@ -350,36 +349,36 @@
 			<p class="style3">Are you ready to stream? Check out our Setup Guide for tips on how to get started.<br />Have a
 				question? Check our FAQ page to see if it's already answered there.<br />Seasoned Moonlight user? Give back to the
 				community by joining our Discord and helping other users.</p>
-				<div class="row oneandhalf">
-					<div class="3u">
-						<section class="highlight">
-							<ul class="actions">
+			<div class="row oneandhalf">
+				<div class="3u">
+					<section class="highlight">
+						<ul class="actions">
 							<li><a href="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide" class="button style1">Setup Guide</a></li>
-							</ul>
-						</section>
-					</div>
-					<div class="3u">
-						<section class="highlight">
-							<ul class="actions">
-							<li><a href="https://github.com/moonlight-stream/moonlight-docs/wiki/Frequently-Asked-Questions" class="button style1">FAQ</a></li>
-							</ul>
-						</section>
-					</div>
-					<div class="3u">
-						<section class="highlight">
-							<ul class="actions">
-							<li><a href="https://ideas.moonlight-stream.org" class="button style1">Suggestions</a></li>
-							</ul>
-						</section>
-					</div>
-					<div class="3u">
-						<section class="highlight">
-							<ul class="actions">
-							<li><a href="https://moonlight-stream.org/discord" class="button style1">Discord</a></li>
-							</ul>
-						</section>
-					</div>
+						</ul>
+					</section>
 				</div>
+				<div class="3u">
+					<section class="highlight">
+						<ul class="actions">
+							<li><a href="https://github.com/moonlight-stream/moonlight-docs/wiki/Frequently-Asked-Questions" class="button style1">FAQ</a></li>
+						</ul>
+					</section>
+				</div>
+				<div class="3u">
+					<section class="highlight">
+						<ul class="actions">
+							<li><a href="https://ideas.moonlight-stream.org" class="button style1">Suggestions</a></li>
+						</ul>
+					</section>
+				</div>
+				<div class="3u">
+					<section class="highlight">
+						<ul class="actions">
+							<li><a href="https://moonlight-stream.org/discord" class="button style1">Discord</a></li>
+						</ul>
+					</section>
+				</div>
+			</div>
 		</div>
 	</div>