Yet another restructure to make URLs clickable.