FB login is OK + Some improvements