Merge terms page with privacy page.
Repair bug in 'popular' timeline.