bug fixes to sign up page
merge changes