Add links and refine some styling