Fixing social links bug + a bit refactoring