Improvements to the social add-on

Making some changes on the social add-on as asked in issue #49. This changes are open for discussion and for further improvements.