Add id for links
Clean up titles