Clean up, signup refactoring, add reset password page