Added Facebook login and restructured binding