diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html
new file mode 100644
index 00000000..35a9de18
--- /dev/null
+++ b/_includes/sections/android-addons.html
@@ -0,0 +1,34 @@
+<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
+
+<div class="alert alert-success" role="alert">
+  <strong>Improve your privacy with these add-ons for Android.</strong>
+</div>
+
+<div class="container-fluid">
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12">
+      <img src="assets/img/addons/netguard.png" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
+    </div>
+    <div class="col">
+    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3></p>
+    <p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
+    </div>
+  </div>
+</div>
+
+<div class="alert alert-warning" role="alert">
+  <strong>The following add-ons require root access, which makes your device more vulnerable. Proceed with caution.</strong>
+</div>
+
+<div class="container-fluid">
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12">
+      <img src="assets/img/addons/xprivacylua.png" class="img-fluid d-block mr-auto ml-auto align-middle" alt="XPrivacyLua">
+    </div>
+    <div class="col">
+      <h3>Manage your apps' permissions with <a href="https://lua.xprivacy.eu/">XPrivacyLua</a></h3>
+      <p>Revoking Android permissions from apps often let apps crash or malfunction. <strong>XPrivacyLua</strong> solves this by feeding apps fake data instead of real data.</p>
+      <p>Requirements: <a href="https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445">Magisk (xda-developers)</a>, <a href="https://forum.xda-developers.com/xposed">Xposed Framework (xda-developers)</a></p>
+    </div>
+  </div>
+</div>
diff --git a/index.html b/index.html
index f9217f2f..e5ee59e1 100644
--- a/index.html
+++ b/index.html
@@ -69,29 +69,9 @@ layout: default
 
   {% include sections/mobile-operating-systems.html %}
 
-  <!-- Android add-ons -->
-  <h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
+  {% include sections/android-addons.html %}
 
-  <div class="alert alert-success" role="alert">
-    <strong>Improve your privacy with these add-ons for Android.</strong>
-  </div>
-
-  <h3>Control your traffic with "NetGuard"</h3>
-  <img src="assets/img/addons/netguard.png" class="img-fluid float-left" alt="NetGuard" style="margin-right:30px;">
-  <p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
-  <a href="https://www.netguard.me/">https://www.netguard.me/</a></p>
-  <div class="alert alert-warning" role="alert">
-    <strong>The following add-ons require root access, which makes your device more vulnerable. Proceed with caution.</strong>
-  </div>
-
-  <h3>Manage your apps' permissions with XPrivacyLua</h3>
-  <img src="assets/img/addons/xprivacylua.png" class="img-fluid float-left" alt="XPrivacyLua" style="margin-right:30px;">
-  <p>Revoking Android permissions from apps often let apps crash or malfunction. <strong>XPrivacyLua</strong> solves this by feeding apps fake data instead of real data.
-
-  <a href="https://lua.xprivacy.eu/">https://lua.xprivacy.eu/</a></p>
-  <p> Requirements: <a href="https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445">Magisk (xda-developers)</a>
-  <a href="https://forum.xda-developers.com/xposed">Xposed Framework (xda-developers)</a>
-  </p>  <h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
+  <h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
   <div class="row mb-2">
 
     {% include card.html color="success"