Cleanup and add more links