better style and fix social login