Massive overhaul to make the signin component leaner