Adds signupform, more improvements