Refactor all social views and models