improved signup.html
fixed conflicts