More cleanup with social media icons and click tracking