Use branded social login buttons and fix up a few social login issues

Use branded social login buttons and fix up a few social login issues