diff --git a/index.html b/index.html
index ccd5745..643c2a0 100644
--- a/index.html
+++ b/index.html
@@ -17,9 +17,9 @@
   <meta name="copyright" content="Copyright (c) 1999-2015 ImageMagick Studio LLC">
   <meta name="distribution" content="Global">
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1">
-  <link href="images/wand.ico" type="images/x-icon" rel="shortcut icon">
-  <link href="images/wand.png" type="images/png" rel="icon">
-  <link href="css/magick.html" type="text/css" rel="stylesheet">
+  <link rel="icon" href="images/wand.png">
+  <link rel="shortcut icon" href="images/wand.ico">
+  <link rel="stylesheet" href="css/magick.html">
 </head>
 <body>
 <div class="main">
@@ -53,13 +53,13 @@
 <p>ImageMagick utilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.</p>
 <p>ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under the Apache 2.0 <a href="http://www.imagemagick.org/www/license.html">license</a>.</p>
 
-<p>The ImageMagick development process ensures a <a href="http://upstream-tracker.org/versions/imagemagick.html">stable API</a> and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="https://code.google.com/p/address-sanitizer/">memory error</a> and <a href="https://code.google.com/p/data-race-test/wiki/ThreadSanitizer">thread data race</a> detection to prevent security vulnerabilities.</p>
+<p>The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="https://code.google.com/p/address-sanitizer/">memory error</a> and <a href="https://code.google.com/p/data-race-test/wiki/ThreadSanitizer">thread data race</a> detection to prevent security vulnerabilities.</p>
 
 <p>The current release is ImageMagick 7.0.0-0 available from <a href="http://www.imagemagick.org/download/beta">http://www.imagemagick.org/download/beta</a>.  It runs on <a href="http://www.imagemagick.org/download/linux/">Linux</a>, <a href="http://www.imagemagick.org/download/binaries/">Windows</a>, <a href="http://www.imagemagick.org/download/binaries/">Mac Os X</a>, <a href="http://www.imagemagick.org/download/iOS/">iOS</a>, Android OS, and others.</p>
 
 <p>The authoritative ImageMagick web site is <a href="http://www.imagemagick.org/">http://www.imagemagick.org</a>. The authoritative source code repository is <a href="https://subversion.imagemagick.org/subversion/ImageMagick/">https://subversion.imagemagick.org/subversion/ImageMagick/</a>.</p>
 
-<h2 class="magick-header">Features and Capabilities</h2>
+<h2 class="magick-header"><a id="features">Features and Capabilities</a></h2>
 <p>Here are just a few <a href="www/examples.html">examples</a> of what ImageMagick can do for you:</p>
 <div class="table-responsive">
 <table class="table table-condensed table-striped">