Preparation for clickable links

Putting things in place for clickable links.