Tweaks to make index page exactly match old one