Fix sign up crash, and few style additions