fixing signing in and up
fixed merge conflicts for displaying sign up page