merge
CSS fixes
Social links
Fix things.