Restructure and add more links.