Move new homepage stuff into correct template; remove haystack from urls.