Clean up and add social icons