social nav
Fixed merge conflicts and social buttons