Listify and fix links