diff --git a/website/index.html b/website/index.html
index fadf236e..869b24e1 100644
--- a/website/index.html
+++ b/website/index.html
@@ -25,7 +25,7 @@
 		<link rel="icon" href="favicon.png" />
 		
 		<!-- Fonts -->
-		<link href='http://fonts.googleapis.com/css?family=Dawning+of+a+New+Day' rel='stylesheet' type='text/css'>
+		<link href='http://fonts.googleapis.com/css?family=Dawning+of+a+New+Day' rel='stylesheet' type='text/css' />
 		
 		<!-- Java Deployment Toolkit -->
 		<!-- <script type="text/javascript" src="http://www.java.com/js/deployJava.js"></script> -->
@@ -245,11 +245,11 @@
 					</ul>
 					<p>Setting up a <strong>fully automated media center</strong> – extract archives, organize tv shows and movies, download subtitles, fetch artwork and metadata, update XBMC – with FileBot it's <a href="http://www.filebot.net/forums/viewtopic.php?f=4&amp;t=215#p1561">that</a> easy!</p>
 					<ul style="list-style-type:  square; border: thin dotted lavender; background: #FDFDFF">
-						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&t=215#p1561" target="_blank">µTorrent Integration for Windows</a></li>
-						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&t=520#p3470" target="_blank">Transmission Integration for Mac</a></li>
-						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&t=215#p3382" target="_blank">Deluge Integration for Linux</a></li>
-						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&t=215#p5316" target="_blank">rTorrent Integration for any Linux server</a></li>
-						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&t=215" target="_blank">Console tool for arbitrary use on any platform</a></li>
+						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&amp;t=215#p1561" target="_blank">µTorrent Integration for Windows</a></li>
+						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&amp;t=520#p3470" target="_blank">Transmission Integration for Mac</a></li>
+						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&amp;t=215#p3382" target="_blank">Deluge Integration for Linux</a></li>
+						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&amp;t=215#p5316" target="_blank">rTorrent Integration for any Linux server</a></li>
+						<li><a href="http://www.filebot.net/forums/viewtopic.php?f=4&amp;t=215" target="_blank">Console tool for arbitrary use on any platform</a></li>
 					</ul>
 					<p>If you have any questions or problems just to check the <a href="http://www.filebot.net/forums/viewtopic.php?f=3&amp;t=7">FAQ</a> or search the <a href="http://www.filebot.net/forums/">forums</a>.</p>
 				</div>
@@ -342,7 +342,7 @@
 					<h2>Download</h2>
 					<ul class="list">
 						<li class="ubuntu">Ubuntu App is available in the <a target="_blank" href="https://apps.ubuntu.com/cat/applications/filebot/">Ubuntu Software Center</a></li>
-						<li>Windows installer: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_setup.exe'])" target="_blank" href="download.php?mode=s&amp;type=nsis">FileBot_@{version}-setup.exe</a>
+						<li>Windows installer: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_setup.exe'])" target="_blank" href="download.php?mode=s&amp;type=nsis">FileBot_@{version}-setup.exe</a></li>
 						<li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="download.php?mode=s&amp;type=app">FileBot_@{version}.app</a></li>
 						<li>Debian packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i386.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=i386">filebot_@{version}_i386.deb</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_amd64.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=amd64">filebot_@{version}_amd64.deb</a></li>
 						<li>Embedded Linux packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_arm.ipk'])" target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=arm">filebot_@{version}_arm.ipk</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i686.ipk'])" target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=i686">filebot_@{version}_i686.ipk</a></li>
@@ -353,7 +353,7 @@
 						</li>
 						<li>Windows package is available <a target="_blank" href="http://chocolatey.org/packages/filebot/">via Chocolatey</a></li>
                         <li>OS X package is available <a target="_blank" href="http://caskroom.io/">via Homebrew Cask</a></li>
-                        <li>Synology NAS package is available <a target="_blank" href="http://www.filebot.net/forums/viewtopic.php?f=3&t=1802">via Package Center</a></li>
+                        <li>Synology NAS package is available <a target="_blank" href="http://www.filebot.net/forums/viewtopic.php?f=3&amp;t=1802">via Package Center</a></li>
 						<li>All files and other versions are available at <a target="_blank" href="https://sourceforge.net/projects/filebot/files/filebot/">SourceForge.net</a></li>
 					</ul>
 				</div>