Changed around routing; made spec more readable via subject-page deal.