diff --git a/Appendix-B:-Firefox-Add-ons.md b/Appendix-B:-Firefox-Add-ons.md
index dbf83c5..4f4898e 100644
--- a/Appendix-B:-Firefox-Add-ons.md
+++ b/Appendix-B:-Firefox-Add-ons.md
@@ -17,30 +17,30 @@ These are all, where applicable, best configured to `deny-all` and whitelist.
   * Essential if you are not using Mozilla's Tracking Protection and Safe Browsing
 * [uMatrix](https://addons.mozilla.org/en-US/firefox/addon/umatrix/)
 * [Cookie Controller](https://addons.mozilla.org/en-US/firefox/addon/cookie-controller/) <sup>1</sup>
-* [Self-Destructing Cookies](https://addons.mozilla.org/en-US/firefox/addon/self-destructing-cookies/) <sup>1</sup>
-* [Smart Referer](https://addons.mozilla.org/en-US/firefox/addon/smart-referer/) :pushpin:
-  * Will be disabled by FF53 (`multiprocessCompatible` flag is missing)
-  * [WebExtension](https://github.com/meh/smart-referer/tree/wext) under development
+* :pushpin: [Self-Destructing Cookies](https://addons.mozilla.org/en-US/firefox/addon/self-destructing-cookies/) <sup>1</sup>
 * [HTTPS Everywhere](https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/)
 * [CanvasBlocker](https://addons.mozilla.org/en-US/firefox/addon/canvasblocker/)
 * [No Resource URI Leak](https://addons.mozilla.org/en-US/firefox/addon/no-resource-uri-leak/)
+* :pushpin: [NoRedirect](https://addons.mozilla.org/en-US/firefox/addon/noredirect/)
+  * Will be disabled by FF53 (`multiprocessCompatible` flag is missing)
+  * Use [this](https://addons.mozilla.org/en-US/firefox/addon/noredirect-clone/) patched version, which will last until e10s is enforced
 * [Decentraleyes](https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/)
 * [Greasemonkey](https://addons.mozilla.org/en-Us/firefox/addon/greasemonkey/)
   * Allows you to run [User Scripts](https://github.com/ghacksuserjs/ghacks-user.js/wiki/3.1-User-Scripts) which can do neat things
-* [NoRedirect](https://addons.mozilla.org/en-US/firefox/addon/noredirect/) :pushpin: 
-  * Will be disabled by FF53 (`multiprocessCompatible` flag is missing)
-  * Use [this](https://addons.mozilla.org/en-US/firefox/addon/noredirect-clone/) patched version, which will last until e10s is enforced
-* [UAControl](https://addons.mozilla.org/en-US/firefox/addon/uacontrol/) <sup>2</sup> :pushpin: 
-* [User-Agent JS Fixer](https://addons.mozilla.org/en-US/firefox/addon/user-agent-js-fixer/) <sup>2</sup> :pushpin: 
 * [Pure URL](https://addons.mozilla.org/en-US/firefox/addon/pure-url/)
 * [Quick Java](https://addons.mozilla.org/en-US/firefox/addon/quickjava/)
-  * Configurable toggle buttons for JS, Java, Flash, Images and more. Suggest you don't use/enable anything that will conflict, such as the Cookies toggle.
+  * Configurable toggle buttons for JS, ~~Java~~, Flash, images and more. Suggest you don't use/enable anything that will conflict, such as the Cookies toggle.
+* :pushpin: [Smart Referer](https://addons.mozilla.org/en-US/firefox/addon/smart-referer/)
+  * Will be disabled by FF53 (`multiprocessCompatible` flag is missing)
+  * [WebExtension](https://github.com/meh/smart-referer/tree/wext) under development
 
 <sup>1</sup> Don't use multiple cookie add-ons
 
-<sup>2</sup> We do not recommend UA spoofing (see section 2697 in the `ghacks user.js`). If you do, UAControl offers whitelisting. User-Agent JS Fixer is only needed if your choice of add-on doesn't cover JS
-
 ### :small_orange_diamond: Don't Bother Recommending These...
 * Ghostery
 * Disconnect
-* Privacy Badger
\ No newline at end of file
+* Privacy Badger
+* :pushpin: [UAControl](https://addons.mozilla.org/en-US/firefox/addon/uacontrol/) <sup>1</sup> (or any other UA add-on)
+* :pushpin: [User-Agent JS Fixer](https://addons.mozilla.org/en-US/firefox/addon/user-agent-js-fixer/) <sup>1</sup>
+
+<sup>1</sup> We do not recommend UA spoofing (see section 2697 in the `ghacks user.js`). If you do, UAControl offers whitelisting. User-Agent JS Fixer is only needed if your choice of add-on doesn't cover JS