Improve facebook integration