Lots of changes, adding social buttons, cleaning up code, etc