adding some more things to signup form
fixing conflicts