diff --git a/_pages/download-linux-with-jre.html b/_pages/download-linux-with-jre.html
new file mode 100644
index 0000000..5f608cc
--- /dev/null
+++ b/_pages/download-linux-with-jre.html
@@ -0,0 +1,22 @@
+---
+layout: site
+title: BEAST Linux Download with JRE
+tags: []
+---
+
+	
+<h2>Downloading BEAST for Linux</h2>
+<p>The BEAST Download should be under way.
+<p>Once the file is downloaded, uncompress the file (<code>tar fxz BEAST.v2.5.0.Linux.tgz</code>) which creates a <code>beast</code> directory.
+<p>Start BEAST, BEAUti or the other programs from a terminal using any of the scripts in <code>beast/bin</code>.
+
+<h2>Trouble shooting</h2>
+<h3>Starting issues</h3>
+<p> BEAST requires Java version 8 or higher, which you can get from your package manager, or from Oracle, e.g <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html">here</a>.
+
+<h3>Download issues</h3>
+<p>If the download failed, you can always get it from the <a href="https://github.com/CompEvol/beast2/releases">release page</a>.
+
+<script>
+window.location="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_JRE.v2.5.0.Linux.tgz"
+</script>
diff --git a/_pages/download-linux.html b/_pages/download-linux.html
new file mode 100644
index 0000000..3b9aebe
--- /dev/null
+++ b/_pages/download-linux.html
@@ -0,0 +1,22 @@
+---
+layout: site
+title: BEAST Linux Download 
+tags: []
+---
+
+	
+<h2>Downloading BEAST for Linux</h2>
+<p>The BEAST Download should be under way.
+<p>Once the file is downloaded, uncompress the file (<code>tar fxz BEAST.v2.5.0.Linux.tgz</code>) which creates a <code>beast</code> directory.
+<p>Start BEAST, BEAUti or the other programs from a terminal using any of the scripts in <code>beast/bin</code>.
+
+<h2>Trouble shooting</h2>
+<h3>Starting issues</h3>
+<p> BEAST requires Java version 8 or higher, which you can get from your package manager, or from Oracle, e.g <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html">here</a>.
+
+<h3>Download issues</h3>
+<p>If the download failed, you can always get it from the <a href="https://github.com/CompEvol/beast2/releases">release page</a>.
+
+<script>
+window.location="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Linux.tgz"
+</script>
diff --git a/_pages/download-mac-with-jre.html b/_pages/download-mac-with-jre.html
new file mode 100644
index 0000000..b2cff65
--- /dev/null
+++ b/_pages/download-mac-with-jre.html
@@ -0,0 +1,26 @@
+---
+layout: site
+title: BEAST Mac Download with JRE
+tags: []
+---
+
+	
+<h2>Downloading BEAST for Mac</h2>
+<p>The BEAST Download should be under way.
+<p>Once the file is downloaded, open the dmg file by double clicking it, and drag the BEAST folder into the Application folder in the window that pops up.
+
+<p>Start BEAST, BEAUti or the other programs by double clicking the icon in the <code>BEAST </code> directory in the Application folder.
+<p>You can also start them from a terminal using any of the scripts in <code>/Applications/BEAST v2.5.0/bin</code>.
+
+<h2>Trouble shooting</h2>
+<h3>BEAST does not start</h3>
+<p>If BEAST or BEAUti does not launch, this is probably due to Java not being installed, or the default version of Java is not Java 8 or higher.
+<p>To fix this, install the JDK (<b>not the JRE</b>) from Oracle, available <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html">here</a>.
+<p>&nbsp;
+<h3>Download issues</h3>
+<p>If the download failed, you can always get it from the <a href="https://github.com/CompEvol/beast2/releases">release page</a>.
+
+
+<script>
+window.location="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_JRE.v2.5.0.Mac.dmg"
+</script>
diff --git a/_pages/download-mac.html b/_pages/download-mac.html
new file mode 100644
index 0000000..7a32498
--- /dev/null
+++ b/_pages/download-mac.html
@@ -0,0 +1,26 @@
+---
+layout: site
+title: BEAST Mac Download 
+tags: []
+---
+
+	
+<h2>Downloading BEAST for Mac</h2>
+<p>The BEAST Download should be under way.
+<p>Once the file is downloaded, open the dmg file by double clicking it, and drag the BEAST folder into the Application folder in the window that pops up.
+
+<p>Start BEAST, BEAUti or the other programs by double clicking the icon in the <code>BEAST </code> directory in the Application folder.
+<p>You can also start them from a terminal using any of the scripts in <code>/Applications/BEAST v2.5.0/bin</code>.
+
+<h2>Trouble shooting</h2>
+<h3>BEAST does not start</h3>
+<p>If BEAST or BEAUti does not launch, this is probably due to Java not being installed, or the default version of Java is not Java 8 or higher.
+<p>To fix this, install the JDK (<b>not the JRE</b>) from Oracle, available <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html">here</a>.
+<p>&nbsp;
+<h3>Download issues</h3>
+<p>If the download failed, you can always get it from the <a href="https://github.com/CompEvol/beast2/releases">release page</a>.
+
+
+<script>
+window.location="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Mac.dmg"
+</script>
diff --git a/_pages/download-windows-with-jre.html b/_pages/download-windows-with-jre.html
new file mode 100644
index 0000000..67e1666
--- /dev/null
+++ b/_pages/download-windows-with-jre.html
@@ -0,0 +1,21 @@
+---
+layout: site
+title: BEAST Windows Download with JRE 
+tags: []
+---
+	
+<h2>Downloading BEAST for Windows</h2>
+<p>The BEAST Download should be under way.
+<p>Once the file is downloaded, unzip the file and start BEAST, BEAUti or the other programs by double clicking the icon in the BEAST directory.
+
+<h2>Trouble shooting</h2>
+<h3>Download issues</h3>
+<p>If the download failed, you can always get it from the <a href="https://github.com/CompEvol/beast2/releases">release page</a>.
+
+<h3>BEAST does not start</h3>
+<p>BEAST requires Java version 8 or higher and won't start without it.
+You can get Java from Oracle, e.g <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html">here</a>.
+
+<script>
+window.location="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_JRE.v2.5.0.Windows.zip"
+</script>
diff --git a/_pages/download-windows.html b/_pages/download-windows.html
new file mode 100644
index 0000000..f39405f
--- /dev/null
+++ b/_pages/download-windows.html
@@ -0,0 +1,21 @@
+---
+layout: site
+title: BEAST Windows Download 
+tags: []
+---
+	
+<h2>Downloading BEAST for Windows</h2>
+<p>The BEAST Download should be under way.
+<p>Once the file is downloaded, unzip the file and start BEAST, BEAUti or the other programs by double clicking the icon in the BEAST directory.
+
+<h2>Trouble shooting</h2>
+<h3>Download issues</h3>
+<p>If the download failed, you can always get it from the <a href="https://github.com/CompEvol/beast2/releases">release page</a>.
+
+<h3>BEAST does not start</h3>
+<p>BEAST requires Java version 8 or higher and won't start without it.
+You can get Java from Oracle, e.g <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html">here</a>.
+
+<script>
+window.location="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Windows.zip"
+</script>
diff --git a/index.html b/index.html
index 7396d00..8e9fb76 100644
--- a/index.html
+++ b/index.html
@@ -10,22 +10,16 @@ <h2>Download</h2>
 <p>The latest version of BEAST 2 is version 2.5.0:</p>
 <ul>
  	<li>Download for Windows
- 	<a id="windowsDownload" href="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Windows.zip"
-	 	onclick="trackOutboundLink('https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Windows.zip'); return false;">without java (8MB)</a>
- 	/<a id="windowsDownload" href="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_JRE.v2.5.0.Windows.zip"
-	 	onclick="trackOutboundLink('https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_JRE.v2.5.0.Windows.zip'); return false;">with java (77MB)</a>	 	
+ 	<a id="windowsDownload" href="/download-windows/">without java (8MB)</a>
+ 	/<a id="windowsDownload" href="/download-windows-with-jre/">with java (77MB)</a>	 	
 	 	</li>
  	<li>Download for Mac OS X
- 	<a id="macDownload" href="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Mac.dmg"
- 		onclick="trackOutboundLink('https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Mac.dmg'); return false;">without java (8MB)</a>
-<!-- 	/<a id="macDownload" href="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_JRE.v2.5.0.Mac.dmg"
- 		onclick="trackOutboundLink('https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_JRE.v2.5.0.Mac.dmg'); return false;">with java (74MB)</a>-->
+ 	<a id="macDownload" href="/download-mac/">without java (8MB)</a>
+<!-- 	/<a id="macDownload" href="/download-mac-with-jre/">with java (74MB)</a>-->
  		</li>
  	<li>Download for Linux
- 	<a id="linuxDownload" href="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Linux.tgz"
-	 	onclick="trackOutboundLink('https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST.v2.5.0.Linux.tgz'); return false;">without java (8MB)</a>
- 	/<a id="linuxDownload" href="https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_jre.v2.5.0.Linux.tgz"
-	 	onclick="trackOutboundLink('https://github.com/CompEvol/beast2/releases/download/v2.5.0/BEAST_with_jre.v2.5.0.Linux.tgz'); return false;">with java (84MB)</a>
+ 	<a id="linuxDownload" href="/download-linux/">without java (8MB)</a>
+ 	/<a id="linuxDownload" href="/download-linux-with-jre/">with java (84MB)</a>
 	 	</li>
 </ul>	 	
 <p>If you download a version of BEAST without Java, you need to install Java separately. BEAST requires Java version 8 or higher.