Social buttons and more cleanup